[Emacs-diffs] /srv/bzr/emacs/trunk r102640: * lisp/bookmark.el (bookmark-name-from-full-record): Rename back to

[Karl Fogel]

------------------------------------------------------------
revno: 102640
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Sun 2010-12-12 11:53:24 -0500
message:
  * lisp/bookmark.el (bookmark-name-from-full-record): Rename back to
    this original name from `bookmark-name-from-record' reverting part of
    rev 102609 / address@hidden
    As Drew Adams pointed out, there was no reason to cause churn for
    third-party callers.
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-12 12:24:56 +0000
+++ b/lisp/ChangeLog    2010-12-12 16:53:24 +0000
@@ -1,3 +1,11 @@
+2010-12-12  Karl Fogel  <address@hidden>
+
+       * bookmark.el (bookmark-name-from-full-record): Rename back to
+       this original name from `bookmark-name-from-record' reverting part
+       of rev 102609 / address@hidden
+       As Drew Adams pointed out, there was no reason to cause churn for
+       third-party callers.
+
 2010-12-12  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-engine.el (c-forward-type): Before scanning a

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2010-12-08 08:09:27 +0000
+++ b/lisp/bookmark.el  2010-12-12 16:53:24 +0000
@@ -305,7 +305,7 @@
 ;; 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 @@
 (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 @@
     (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 @@
     (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 @@
     (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 "")))