aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-03-10 17:40:55 -0400
committerStefan Monnier2013-03-10 17:40:55 -0400
commit17f323276b7dea5410d8f495015ebd170ef14091 (patch)
tree2218bb528ad55d6c0afc992eb8a691d655c08700
parent33f5bc1cbc22e6b6b600f219aab0fdc4f987eec7 (diff)
downloademacs-17f323276b7dea5410d8f495015ebd170ef14091.tar.gz
emacs-17f323276b7dea5410d8f495015ebd170ef14091.zip
* lisp/emacs-lisp/byte-run.el (dont-compile): Declare obsolete.
(with-no-warnings): Use `declare'.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/byte-run.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4add4d9383f..75fa55da3eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12013-03-10 Stefan Monnier <monnier@iro.umontreal.ca> 12013-03-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/byte-run.el (dont-compile): Declare obsolete.
4 (with-no-warnings): Use `declare'.
5
3 * whitespace.el (whitespace-enable-predicate): New variable. 6 * whitespace.el (whitespace-enable-predicate): New variable.
4 (whitespace-enable-predicate): Use it. 7 (whitespace-enable-predicate): Use it.
5 8
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 48bcefaee1a..7e1f89871f1 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -378,7 +378,7 @@ obsolete."
378(defmacro dont-compile (&rest body) 378(defmacro dont-compile (&rest body)
379 "Like `progn', but the body always runs interpreted (not compiled). 379 "Like `progn', but the body always runs interpreted (not compiled).
380If you think you need this, you're probably making a mistake somewhere." 380If you think you need this, you're probably making a mistake somewhere."
381 (declare (debug t) (indent 0)) 381 (declare (debug t) (indent 0) (obsolete nil "24.4"))
382 (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body))))) 382 (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body)))))
383 383
384 384
@@ -402,9 +402,9 @@ In interpreted code, this is entirely equivalent to `progn'."
402 ;; macroexpansion. 402 ;; macroexpansion.
403 (list 'quote (eval (cons 'progn body) lexical-binding))) 403 (list 'quote (eval (cons 'progn body) lexical-binding)))
404 404
405(put 'with-no-warnings 'lisp-indent-function 0)
406(defun with-no-warnings (&rest body) 405(defun with-no-warnings (&rest body)
407 "Like `progn', but prevents compiler warnings in the body." 406 "Like `progn', but prevents compiler warnings in the body."
407 (declare (indent 0))
408 ;; The implementation for the interpreter is basically trivial. 408 ;; The implementation for the interpreter is basically trivial.
409 (car (last body))) 409 (car (last body)))
410 410