aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2010-02-10 15:04:51 -0500
committerStefan Monnier2010-02-10 15:04:51 -0500
commit348d1e60a63ad8d8f3ba49c54473fde6e68bba60 (patch)
tree386831cd9be2f4366a2aa903a4cdb8cfebaced29 /lisp
parentdbf8402bc76a775284905f09399b4d88ee0c03e5 (diff)
downloademacs-348d1e60a63ad8d8f3ba49c54473fde6e68bba60.tar.gz
emacs-348d1e60a63ad8d8f3ba49c54473fde6e68bba60.zip
(Info-bookmark-jump): Simplify.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/info.el2
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a157d9f7fb..13a04d0f66d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-02-10 Thierry Volpiatto <thierry.volpiatto@gmail.com> 12010-02-10 Thierry Volpiatto <thierry.volpiatto@gmail.com>
2 2
3 * info.el (Info-bookmark-jump): Simplify.
4
3 * bookmark.el (bookmark-handle-bookmark): Catch the right error. 5 * bookmark.el (bookmark-handle-bookmark): Catch the right error.
4 (bookmark-default-handler): Accept new bookmark field `buffer'. 6 (bookmark-default-handler): Accept new bookmark field `buffer'.
5 7
@@ -10,13 +12,13 @@
102010-02-10 Michael Albinus <michael.albinus@gmx.de> 122010-02-10 Michael Albinus <michael.albinus@gmx.de>
11 13
12 * ls-lisp.el (ls-lisp-insert-directory): When WILDCARD-REGEXP and 14 * ls-lisp.el (ls-lisp-insert-directory): When WILDCARD-REGEXP and
13 FULL-DIRECTORY-P are nil, and FILE is absolute, expand it. This 15 FULL-DIRECTORY-P are nil, and FILE is absolute, expand it.
14 prevents file names like "~/" being listed literally. 16 This prevents file names like "~/" being listed literally.
15 17
162010-02-10 Dan Nicolaescu <dann@ics.uci.edu> 182010-02-10 Dan Nicolaescu <dann@ics.uci.edu>
17 19
18 * term/xterm.el (xterm-maybe-set-dark-background-mode): Remove 20 * term/xterm.el (xterm-maybe-set-dark-background-mode):
19 dead code. (Bug#5546) 21 Remove dead code. (Bug#5546)
20 22
212010-02-09 Chong Yidong <cyd@stupidchicken.com> 232010-02-09 Chong Yidong <cyd@stupidchicken.com>
22 24
diff --git a/lisp/info.el b/lisp/info.el
index 4789d67e659..93001496b5c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4797,7 +4797,7 @@ type returned by `Info-bookmark-make-record', which see."
4797 ;; Use bookmark-default-handler to move to the appropriate location 4797 ;; Use bookmark-default-handler to move to the appropriate location
4798 ;; within the node. 4798 ;; within the node.
4799 (bookmark-default-handler 4799 (bookmark-default-handler
4800 (list* "" `(buffer . ,buf) (bookmark-get-bookmark-record bmk))))) 4800 `("" (buffer . ,buf) . ,(bookmark-get-bookmark-record bmk)))))
4801 4801
4802(provide 'info) 4802(provide 'info)
4803 4803