[Emacs-diffs] Changes to emacs/lisp/bookmark.el

[Romain Francoise]

Index: emacs/lisp/bookmark.el
diff -c emacs/lisp/bookmark.el:1.82 emacs/lisp/bookmark.el:1.83
*** emacs/lisp/bookmark.el:1.82 Tue Oct 18 11:05:11 2005
--- emacs/lisp/bookmark.el      Tue Oct 18 18:29:11 2005
***************
*** 1175,1187 ****
      (prog1
        (insert (bookmark-location bookmark)) ; *Return this line*
        (if (and (display-color-p) (display-mouse-p))
!         (add-text-properties start
!                              (save-excursion (re-search-backward
!                                               "[^ \t]")
                                               (1+ (point)))
!                              '(mouse-face highlight
!                                follow-link t
!                                help-echo "mouse-2: go to this bookmark"))))))
  
  ;;;###autoload
  (defalias 'bookmark-locate 'bookmark-insert-location)
--- 1175,1188 ----
      (prog1
        (insert (bookmark-location bookmark)) ; *Return this line*
        (if (and (display-color-p) (display-mouse-p))
!         (add-text-properties
!          start
!          (save-excursion (re-search-backward
!                           "[^ \t]")
                                               (1+ (point)))
!          '(mouse-face highlight
!            follow-link t
!            help-echo "mouse-2: go to this bookmark in other window"))))))
  
  ;;;###autoload
  (defalias 'bookmark-locate 'bookmark-insert-location)
***************
*** 1567,1579 ****
         (let ((start (point)))
           (insert (bookmark-name-from-full-record full-record))
           (if (and (display-color-p) (display-mouse-p))
!              (add-text-properties start
!                                   (save-excursion (re-search-backward
!                                                    "[^ \t]")
!                                                   (1+ (point)))
!                                   '(mouse-face highlight
!                                     follow-link t
!                                     help-echo "mouse-2: go to this 
bookmark")))
           (insert "\n")
           )))
       bookmark-alist))
--- 1568,1581 ----
         (let ((start (point)))
           (insert (bookmark-name-from-full-record full-record))
           (if (and (display-color-p) (display-mouse-p))
!              (add-text-properties
!               start
!               (save-excursion (re-search-backward
!                                "[^ \t]")
!                               (1+ (point)))
!               '(mouse-face highlight
!                 follow-link t
!                 help-echo "mouse-2: go to this bookmark in other window")))
           (insert "\n")
           )))
       bookmark-alist))
***************
*** 1697,1710 ****
                (let ((start (point)))
                  (insert (car bookmark-bmenu-hidden-bookmarks))
                  (if (and (display-color-p) (display-mouse-p))
!                     (add-text-properties start
!                                          (save-excursion (re-search-backward
!                                                           "[^ \t]")
!                                                          (1+ (point)))
!                                          '(mouse-face highlight
!                                            follow-link t
!                                            help-echo
!                                            "mouse-2: go to this bookmark"))))
                  (setq bookmark-bmenu-hidden-bookmarks
                        (cdr bookmark-bmenu-hidden-bookmarks))
                  (forward-line 1))))))))
--- 1699,1713 ----
                (let ((start (point)))
                  (insert (car bookmark-bmenu-hidden-bookmarks))
                  (if (and (display-color-p) (display-mouse-p))
!                     (add-text-properties
!                      start
!                      (save-excursion (re-search-backward
!                                       "[^ \t]")
!                                      (1+ (point)))
!                      '(mouse-face highlight
!                        follow-link t
!                        help-echo
!                        "mouse-2: go to this bookmark in other window"))))
                  (setq bookmark-bmenu-hidden-bookmarks
                        (cdr bookmark-bmenu-hidden-bookmarks))
                  (forward-line 1))))))))