# HG changeset patch
# User Karl Fogel <kfogel@red-bean.com>
# Date 1279059471 14400
# Node ID 32e3de61d8a0c22e7d97240fbc3a428ef2b6e180
# Parent  dcdf09a52e2c8f79e5f5117d2cbebdf0774d668d
* 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.

diff -r dcdf09a52e2c -r 32e3de61d8a0 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 13 18:09:20 2010 -0400
+++ b/lisp/ChangeLog	Tue Jul 13 18:17:51 2010 -0400
@@ -1,3 +1,10 @@
+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,
diff -r dcdf09a52e2c -r 32e3de61d8a0 lisp/bookmark.el
--- a/lisp/bookmark.el	Tue Jul 13 18:09:20 2010 -0400
+++ b/lisp/bookmark.el	Tue Jul 13 18:17:51 2010 -0400
@@ -1733,15 +1733,15 @@
   "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 ()