aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-11-24 02:21:32 +0000
committerStefan Monnier2009-11-24 02:21:32 +0000
commit83505cfea1c0096cebb96b79e8783e8632127ed2 (patch)
tree1f4e0bf66be49c3016e2dc4e2641384dbc334c5c
parent5241b291dd078aea93fb622a4de1c20c8278e1df (diff)
downloademacs-83505cfea1c0096cebb96b79e8783e8632127ed2.tar.gz
emacs-83505cfea1c0096cebb96b79e8783e8632127ed2.zip
(bookmark-bmenu-search): Clear echo area when exiting.
-rw-r--r--lisp/ChangeLog32
-rw-r--r--lisp/bookmark.el1
2 files changed, 20 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c6dacc9f78..e84607aab70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-11-24 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * bookmark.el (bookmark-bmenu-search): Clear echo area when exiting.
4
12009-11-23 Ken Brown <kbrown@cornell.edu> (tiny change) 52009-11-23 Ken Brown <kbrown@cornell.edu> (tiny change)
2 6
3 * net/browse-url.el (browse-url-filename-alist): On Windows, add 7 * net/browse-url.el (browse-url-filename-alist): On Windows, add
@@ -10,8 +14,9 @@
10 14
11 Implement DocView Continuous mode. (Bug#4896) 15 Implement DocView Continuous mode. (Bug#4896)
12 * doc-view.el (doc-view-continuous-mode): New defcustom. 16 * doc-view.el (doc-view-continuous-mode): New defcustom.
13 (doc-view-mode-map): Bind C-n/<down> to `doc-view-next-line-or-next-page', 17 (doc-view-mode-map): Bind C-n/<down> to
14 C-p/<up> to `doc-view-previous-line-or-previous-page'. 18 `doc-view-next-line-or-next-page', C-p/<up> to
19 `doc-view-previous-line-or-previous-page'.
15 (doc-view-next-line-or-next-page) 20 (doc-view-next-line-or-next-page)
16 (doc-view-previous-line-or-previous-page): New commands. 21 (doc-view-previous-line-or-previous-page): New commands.
17 22
@@ -114,12 +119,13 @@
114 (viper-prefix-arg-value): Do correct conversion of event-char for 119 (viper-prefix-arg-value): Do correct conversion of event-char for
115 XEmacs. 120 XEmacs.
116 121
117 * emulation/viper-util.el, emulation/viper.el: Use 122 * emulation/viper-util.el, emulation/viper.el:
118 viper-last-command-char instead of last-command-char/last-command-event. 123 Use viper-last-command-char instead of
124 last-command-char/last-command-event.
119 125
120 * ediff-init.el, ediff-mult.el, ediff-util.el: Replace 126 * ediff-init.el, ediff-mult.el, ediff-util.el:
121 last-command-char and last-command-event with (ediff-last-command-char) 127 Replace last-command-char and last-command-event
122 everywhere. 128 with (ediff-last-command-char) everywhere.
123 129
124 * ediff-vers.el (ediff-rcs-get-output-buffer): Make sure the buffer is 130 * ediff-vers.el (ediff-rcs-get-output-buffer): Make sure the buffer is
125 created in fundamental mode. 131 created in fundamental mode.
@@ -135,8 +141,8 @@
1352009-11-21 Chong Yidong <cyd@stupidchicken.com> 1412009-11-21 Chong Yidong <cyd@stupidchicken.com>
136 142
137 * cedet/semantic/complete.el (semantic-complete-read-tag-engine) 143 * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
138 (semantic-complete-jump-local, semantic-complete-jump): Improve 144 (semantic-complete-jump-local, semantic-complete-jump):
139 prompt string. 145 Improve prompt string.
140 146
1412009-11-21 Jan Djärv <jan.h.d@swipnet.se> 1472009-11-21 Jan Djärv <jan.h.d@swipnet.se>
142 148
@@ -144,13 +150,13 @@
144 150
1452009-11-21 Nathaniel Flath <flat0103@gmail.com> 1512009-11-21 Nathaniel Flath <flat0103@gmail.com>
146 152
147 * progmodes/cc-menus.el (cc-imenu-java-generic-expression): A 153 * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
148 corrected version of the patch from 2009-11-18. (Bug#3910) 154 Correct the patch from 2009-11-18. (Bug#3910)
149 155
1502009-11-21 Alan Mackenzie <acm@muc.de> 1562009-11-21 Alan Mackenzie <acm@muc.de>
151 157
152 * progmodes/cc-menus.el (cc-imenu-java-generic-expression): Update 158 * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
153 to deal with modern Java constructs. 159 Update to deal with modern Java constructs.
154 160
1552009-11-21 Tassilo Horn <tassilo@member.fsf.org> 1612009-11-21 Tassilo Horn <tassilo@member.fsf.org>
156 162
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 77b51a14f67..03d0c585a8f 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -2097,6 +2097,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
2097 (unwind-protect 2097 (unwind-protect
2098 (bookmark-read-search-input) 2098 (bookmark-read-search-input)
2099 (cancel-timer timer) 2099 (cancel-timer timer)
2100 (message nil)
2100 (when bookmark-quit-flag ; C-g hit restore menu list. 2101 (when bookmark-quit-flag ; C-g hit restore menu list.
2101 (bookmark-bmenu-list) (bookmark-bmenu-goto-bookmark bmk)) 2102 (bookmark-bmenu-list) (bookmark-bmenu-goto-bookmark bmk))
2102 (setq bookmark-quit-flag nil)))) 2103 (setq bookmark-quit-flag nil))))