[Emacs-diffs] emacs/lisp ChangeLog help-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/15 05:16:54

Modified files:
        lisp           : ChangeLog help-mode.el 

Log message:
        (help-make-xrefs): Undo the last revert, and replace it with a real fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16633&r2=1.16634
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-mode.el?cvsroot=emacs&r1=1.70&r2=1.71

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16633
retrieving revision 1.16634
diff -u -b -r1.16633 -r1.16634
--- ChangeLog   15 Nov 2009 05:12:52 -0000      1.16633
+++ ChangeLog   15 Nov 2009 05:16:51 -0000      1.16634
@@ -1,5 +1,8 @@
 2009-11-15  Stefan Monnier  <address@hidden>
 
+       * help-mode.el (help-make-xrefs): Undo the last revert, and replace it
+       with a real fix.
+
        * novice.el (disabled-command-function): Add useful args.
        Setup the help buffer so that [back] works.
        Remove redundant call to help-mode.

Index: help-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-mode.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- help-mode.el        14 Nov 2009 15:44:47 -0000      1.70
+++ help-mode.el        15 Nov 2009 05:16:54 -0000      1.71
@@ -413,8 +413,8 @@
 help buffers.  Variable `help-back-label' specifies the text for
 that."
   (interactive "b")
+  (with-current-buffer (or buffer (current-buffer))
   (save-excursion
-    (set-buffer (or buffer (current-buffer)))
     (goto-char (point-min))
     ;; Skip the header-type info, though it might be useful to parse
     ;; it at some stage (e.g. "function in `library'").
@@ -484,12 +484,12 @@
                               (help-xref-button 8 'help-face sym)))
                          ((match-string 6)) ; nothing for `symbol'
                         ((match-string 7)
-;;;  this used:
-;;;                      #'(lambda (arg)
-;;;                          (let ((location
-;;;                                 (find-function-noselect arg)))
-;;;                            (pop-to-buffer (car location))
-;;;                            (goto-char (cdr location))))
+                            ;; this used:
+                            ;; #'(lambda (arg)
+                            ;;     (let ((location
+                            ;;            (find-function-noselect arg)))
+                            ;;       (pop-to-buffer (car location))
+                            ;;         (goto-char (cdr location))))
                          (help-xref-button 8 'help-function-def sym))
                         ((and
                            (facep sym)
@@ -534,8 +534,8 @@
                 ;; name will be found.
 
                ;; If the keymap substitution isn't the last thing in
-               ;; the doc string, and if there is anything on the
-               ;; same line after it, this code won't recognize the end of it.
+                  ;; the doc string, and if there is anything on the same
+                  ;; line after it, this code won't recognize the end of it.
                 (while (re-search-forward "^key +binding\n\\(-+ +\\)-+\n\n"
                                           nil t)
                   (let ((col (- (match-end 1) (match-beginning 1))))
@@ -576,7 +576,7 @@
       ;; View mode steals RET from us.
       (set (make-local-variable 'minor-mode-overriding-map-alist)
            (list (cons 'view-mode help-xref-override-view-map)))
-      (set-buffer-modified-p old-modified))))
+        (set-buffer-modified-p old-modified)))))
 
 ;;;###autoload
 (defun help-xref-button (match-number type &rest args)