aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/bookmark.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56c2b4c6f98..37ac1c5f3c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-03-26 Boruch Baum <boruch_baum@gmx.com> (tiny change)
2
3 * bookmark.el (bookmark-show-all-annotations): Sort them (bug#20177).
4
12015-03-25 Dmitry Gutov <dgutov@yandex.ru> 52015-03-25 Dmitry Gutov <dgutov@yandex.ru>
2 6
3 * json.el (json-special-chars): Don't treat `/' specially, there's 7 * json.el (json-special-chars): Don't treat `/' specially, there's
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index a49ee7ec8b3..dc8057e6e0d 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1756,7 +1756,7 @@ if an annotation exists."
1756 (save-selected-window 1756 (save-selected-window
1757 (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t) 1757 (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t)
1758 (delete-region (point-min) (point-max)) 1758 (delete-region (point-min) (point-max))
1759 (dolist (full-record bookmark-alist) 1759 (dolist (full-record (bookmark-maybe-sort-alist))
1760 (let* ((name (bookmark-name-from-full-record full-record)) 1760 (let* ((name (bookmark-name-from-full-record full-record))
1761 (ann (bookmark-get-annotation full-record))) 1761 (ann (bookmark-get-annotation full-record)))
1762 (insert (concat name ":\n")) 1762 (insert (concat name ":\n"))