* lisp/bookmark.el (bookmark-show-annotation): Use `when' instead of `if'.

  This is also from Thierry Volpiatto's patch in bug #6444.  However,
  because it was extraneous to the functional change in that patch,
  and causes a re-indendation, I am committing it separately.

2 files changed, 16 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7bf7832488..ab1d043e3f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-13  Karl Fogel  <kfogel@red-bean.com>
 
+        * bookmark.el (bookmark-show-annotation): Use `when' instead of `if'.
+        This is also from Thierry Volpiatto's patch in bug #6444.  However,
+        because it was extraneous to the functional change in that patch,
+        and causes a re-indendation, I am committing it separately.
+
+2010-07-13  Karl Fogel  <kfogel@red-bean.com>
+
         * bookmark.el (bookmark-show-annotation): Ensure annotations show,
         e.g. in Info bookmarks, by using `switch-to-buffer-other-window'.
         Patch by Thierry Volpiatto (Bug#6444).
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b0d06f4e555..7c8ac45bb04 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1733,15 +1733,15 @@ last full line, move to the last full line.  The return value is undefined."
   "Display the annotation for bookmark named BOOKMARK in a buffer,
 if an annotation exists."
   (let ((annotation (bookmark-get-annotation bookmark)))
-    (if (and annotation (not (string-equal annotation "")))
-        (save-excursion
-          (let ((old-buf (current-buffer)))
-            (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t)
-            (delete-region (point-min) (point-max))
-            ;; (insert (concat "Annotation for bookmark '" bookmark "':\n\n"))
-            (insert annotation)
-            (goto-char (point-min))
-            (switch-to-buffer-other-window old-buf))))))
+    (when (and annotation (not (string-equal annotation "")))
+      (save-excursion
+        (let ((old-buf (current-buffer)))
+          (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t)
+          (delete-region (point-min) (point-max))
+          ;; (insert (concat "Annotation for bookmark '" bookmark "':\n\n"))
+          (insert annotation)
+          (goto-char (point-min))
+          (switch-to-buffer-other-window old-buf))))))
 
 
 (defun bookmark-show-all-annotations ()