aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love1999-11-26 21:27:25 +0000
committerDave Love1999-11-26 21:27:25 +0000
commit07c8b450a949c7c30d9610102d4e89b60e9c2f94 (patch)
tree34f5f63fe7c22581ca62a328dcdd2a585926136b
parent19d63704de40eb8ba76827980602a1b630bbd89e (diff)
downloademacs-07c8b450a949c7c30d9610102d4e89b60e9c2f94.tar.gz
emacs-07c8b450a949c7c30d9610102d4e89b60e9c2f94.zip
Fix last change.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/comint.el5
-rw-r--r--lisp/emacs-lisp/advice.el2
3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 294abba1f77..38b4b218f14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
11999-11-26 Dave Love <fx@gnu.org>
2
3 * comint.el: Fix last change.
4
5 * emacs-lisp/advice.el: Fix last change.
6
11999-11-26 Richard M. Stallman <rms@caffeine.ai.mit.edu> 71999-11-26 Richard M. Stallman <rms@caffeine.ai.mit.edu>
2 8
3 * cus-edit.el (Custom-reset-standard): Doc fix. 9 * cus-edit.el (Custom-reset-standard): Doc fix.
diff --git a/lisp/comint.el b/lisp/comint.el
index 6201fc72850..438043c124a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1348,10 +1348,9 @@ string.
1348The functions on the list are called sequentially, and each one is 1348The functions on the list are called sequentially, and each one is
1349given the string returned by the previous one. The string returned by 1349given the string returned by the previous one. The string returned by
1350the last function is the text that is actually inserted in the 1350the last function is the text that is actually inserted in the
1351redirection buffer.") 1351redirection buffer.
1352 1352
1353 1353This variable is permanent-local.")
1354This variable is buffer-local.")
1355 1354
1356;; The purpose of using this filter for comint processes 1355;; The purpose of using this filter for comint processes
1357;; is to keep comint-last-input-end from moving forward 1356;; is to keep comint-last-input-end from moving forward
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 0a4756559e8..c1571d0824e 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3665,7 +3665,7 @@ If FUNCTION was not advised this will be a noop."
3665(defun ad-recover (function) 3665(defun ad-recover (function)
3666 "Try to recover FUNCTION's original definition, and unadvise it. 3666 "Try to recover FUNCTION's original definition, and unadvise it.
3667This is more low-level than `ad-unadvise' in that it does not do 3667This is more low-level than `ad-unadvise' in that it does not do
3668deactivation, which might run hooks and get into other trouble." 3668deactivation, which might run hooks and get into other trouble.
3669Use in emergencies." 3669Use in emergencies."
3670 ;; Use more primitive interactive behavior here: Accept any symbol that's 3670 ;; Use more primitive interactive behavior here: Accept any symbol that's
3671 ;; currently defined in obarray, not necessarily with a function definition: 3671 ;; currently defined in obarray, not necessarily with a function definition: