diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/bookmark.el | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd1b4a400ee..5b0fab21cc9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2010-12-12 Karl Fogel <kfogel@red-bean.com> + + * bookmark.el (bookmark-name-from-full-record): Rename back to + this original name from `bookmark-name-from-record' reverting part + of 2010-12-08T08:09:27Z!kfogel@red-bean.com / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm. + As Drew Adams pointed out, there was no reason to cause churn for + third-party callers. + 2010-12-12 Alan Mackenzie <acm@muc.de> * progmodes/cc-engine.el (c-forward-type): Before scanning a diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 268a370cdb6..9c1034c636e 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -305,7 +305,7 @@ This point is in `bookmark-current-buffer'.") ;; need to know anything about the format of bookmark-alist entries. ;; Everyone else should go through them. -(defun bookmark-name-from-record (bookmark-record) +(defun bookmark-name-from-full-record (bookmark-record) "Return the name of BOOKMARK-RECORD. BOOKMARK-RECORD is, e.g., one element from `bookmark-alist'." (car bookmark-record)) @@ -314,7 +314,7 @@ one element from `bookmark-alist'." (defun bookmark-all-names () "Return a list of all current bookmark names." (bookmark-maybe-load-default-file) - (mapcar 'bookmark-name-from-record bookmark-alist)) + (mapcar 'bookmark-name-from-full-record bookmark-alist)) (defun bookmark-get-bookmark (bookmark-name-or-record &optional noerror) @@ -1391,13 +1391,13 @@ they conflict with existing bookmark names." (dolist (full-record new-list) (bookmark-maybe-rename full-record names) (setq bookmark-alist (nconc bookmark-alist (list full-record))) - (push (bookmark-name-from-record full-record) names)))) + (push (bookmark-name-from-full-record full-record) names)))) (defun bookmark-maybe-rename (full-record names) "Rename bookmark FULL-RECORD if its current name is already used. This is a helper for `bookmark-import-new-list'." - (let ((found-name (bookmark-name-from-record full-record))) + (let ((found-name (bookmark-name-from-full-record full-record))) (if (member found-name names) ;; We've got a conflict, so generate a new name (let ((count 2) @@ -1555,7 +1555,7 @@ deletion, or > if it is flagged for displaying." (add-text-properties (point-min) (point) '(font-lock-face bookmark-menu-heading)) (dolist (full-record (bookmark-maybe-sort-alist)) - (let ((name (bookmark-name-from-record full-record)) + (let ((name (bookmark-name-from-full-record full-record)) (annotation (bookmark-get-annotation full-record)) (start (point)) end) @@ -1745,7 +1745,7 @@ if an annotation exists." (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t) (delete-region (point-min) (point-max)) (dolist (full-record bookmark-alist) - (let* ((name (bookmark-name-from-record full-record)) + (let* ((name (bookmark-name-from-full-record full-record)) (ann (bookmark-get-annotation full-record))) (insert (concat name ":\n")) (if (and ann (not (string-equal ann ""))) |