summaryrefslogtreecommitdiff
path: root/lisp/help-fns.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-06-01 16:32:04 -0300
committerStefan Monnier <monnier@iro.umontreal.ca>2011-06-01 16:32:04 -0300
commit2403c841a8e920fa7e517997ecb5addcca2ecfe7 (patch)
tree4dccd3734a7be1b965df14491b7002260e1876dc /lisp/help-fns.el
parent3b7d5980c94cdf3188b2a5bb002e00d887312957 (diff)
downloademacs-2403c841a8e920fa7e517997ecb5addcca2ecfe7.tar.gz
Silence various byte-compiler warnings.
* lisp/emacs-lisp/byte-run.el (make-obsolete-variable): New argument `access-type' and new obsolescence format. * lisp/emacs-lisp/bytecomp.el (byte-compile-warn-obsolete): Adjust to new format. (byte-compile-check-variable): New `access-type' argument. Only warn if the access-type is obsolete. (byte-compile-dynamic-variable-bind, byte-compile-variable-ref) (byte-compile-variable-set): Adjust callers. * lisp/help-fns.el (describe-variable): Adjust to new obsolescence format. * lisp/mail/sendmail.el (mail-mailer-swallows-blank-line): Only mark setting it as obsolete. * lisp/simple.el (minibuffer-completing-symbol): * lisp/font-lock.el (font-lock-beginning-of-syntax-function): Only mark read access as obsolete. * lisp/minibuffer.el (minibuffer-completing-file-name): Don't make it obsolete yet. * lisp/international/quail.el (quail-mouse-choose-completion): Remove unused code referring to obsolete var. (quail-choose-completion-string): Remove. * lisp/server.el (server-clients-with, server-kill-buffer-query-function) (server-kill-emacs-query-function): Silence "unused `proc'" warnings. * lisp/proced.el (proced-send-signal): * lisp/emacs-lisp/lisp.el (lisp-complete-symbol): Replace completion-annotate-function with completion-extra-properties.
Diffstat (limited to 'lisp/help-fns.el')
-rw-r--r--lisp/help-fns.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 50e60f94c88..1cd62c1dfa4 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -805,7 +805,8 @@ it is displayed along with the global value."
(when obsolete
(setq extra-line t)
(princ " This variable is obsolete")
- (if (cdr obsolete) (princ (format " since %s" (cdr obsolete))))
+ (if (nth 2 obsolete)
+ (princ (format " since %s" (nth 2 obsolete))))
(princ (cond ((stringp use) (concat ";\n " use))
(use (format ";\n use `%s' instead." (car obsolete)))
(t ".")))