aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/simple.el10
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7b3c7a1c2c..35e9f44d6c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12010-03-31 Juri Linkov <juri@jurta.org> 12010-03-31 Juri Linkov <juri@jurta.org>
2 2
3 * simple.el (next-line, previous-line): Re-throw a signal
4 with `signal' instead of using `ding'.
5 http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01432.html
6
72010-03-31 Juri Linkov <juri@jurta.org>
8
3 * simple.el (keyboard-escape-quit): Raise deselecting the active 9 * simple.el (keyboard-escape-quit): Raise deselecting the active
4 region higher than exiting the minibuffer. 10 region higher than exiting the minibuffer.
5 http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00904.html 11 http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00904.html
diff --git a/lisp/simple.el b/lisp/simple.el
index b126637904e..73138111cfe 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4003,9 +4003,10 @@ and more reliable (no dependence on goal column, etc.)."
4003 (insert (if use-hard-newlines hard-newline "\n"))) 4003 (insert (if use-hard-newlines hard-newline "\n")))
4004 (line-move arg nil nil try-vscroll)) 4004 (line-move arg nil nil try-vscroll))
4005 (if (called-interactively-p 'interactive) 4005 (if (called-interactively-p 'interactive)
4006 (condition-case nil 4006 (condition-case err
4007 (line-move arg nil nil try-vscroll) 4007 (line-move arg nil nil try-vscroll)
4008 ((beginning-of-buffer end-of-buffer) (ding))) 4008 ((beginning-of-buffer end-of-buffer)
4009 (signal (car err) (cdr err))))
4009 (line-move arg nil nil try-vscroll))) 4010 (line-move arg nil nil try-vscroll)))
4010 nil) 4011 nil)
4011 4012
@@ -4033,9 +4034,10 @@ to use and more reliable (no dependence on goal column, etc.)."
4033 (interactive "^p\np") 4034 (interactive "^p\np")
4034 (or arg (setq arg 1)) 4035 (or arg (setq arg 1))
4035 (if (called-interactively-p 'interactive) 4036 (if (called-interactively-p 'interactive)
4036 (condition-case nil 4037 (condition-case err
4037 (line-move (- arg) nil nil try-vscroll) 4038 (line-move (- arg) nil nil try-vscroll)
4038 ((beginning-of-buffer end-of-buffer) (ding))) 4039 ((beginning-of-buffer end-of-buffer)
4040 (signal (car err) (cdr err))))
4039 (line-move (- arg) nil nil try-vscroll)) 4041 (line-move (- arg) nil nil try-vscroll))
4040 nil) 4042 nil)
4041 4043