[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/help-mode.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/help-mode.el [lexbind] |
Date: |
Thu, 20 Nov 2003 19:36:36 -0500 |
Index: emacs/lisp/help-mode.el
diff -c emacs/lisp/help-mode.el:1.11.4.2 emacs/lisp/help-mode.el:1.11.4.3
*** emacs/lisp/help-mode.el:1.11.4.2 Tue Oct 14 19:51:05 2003
--- emacs/lisp/help-mode.el Thu Nov 20 19:36:03 2003
***************
*** 213,219 ****
"\\(function\\|command\\)\\|"
"\\(face\\)\\|"
"\\(symbol\\)\\|"
! "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)\\s-+\\)?"
;; Note starting with word-syntax character:
"`\\(\\sw\\(\\sw\\|\\s_\\)+\\)'"))
"Regexp matching doc string references to symbols.
--- 213,220 ----
"\\(function\\|command\\)\\|"
"\\(face\\)\\|"
"\\(symbol\\)\\|"
! "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
! "[ \t\n]+\\)?"
;; Note starting with word-syntax character:
"`\\(\\sw\\(\\sw\\|\\s_\\)+\\)'"))
"Regexp matching doc string references to symbols.
***************
*** 278,284 ****
references for selection with `help-follow'. Cross-references have
the canonical form `...' and the type of reference may be
disambiguated by the preceding word(s) used in
! `help-xref-symbol-regexp'.
If the variable `help-xref-mule-regexp' is non-nil, find also
cross-reference information related to multilingual environment
--- 279,288 ----
references for selection with `help-follow'. Cross-references have
the canonical form `...' and the type of reference may be
disambiguated by the preceding word(s) used in
! `help-xref-symbol-regexp'. Faces only get cross-referenced if
! preceded or followed by the word `face'. Variables without
! variable documentation do not get cross-referenced, unless
! preceded by the word `variable' or `option'.
If the variable `help-xref-mule-regexp' is non-nil, find also
cross-reference information related to multilingual environment
***************
*** 342,352 ****
(sym (intern-soft data)))
(if sym
(cond
! ((match-string 3) ; `variable' &c
(and (boundp sym) ; `variable' doesn't ensure
; it's actually bound
(help-xref-button 8 'help-variable sym)))
! ((match-string 4) ; `function' &c
(and (fboundp sym) ; similarly
(help-xref-button 8 'help-function sym)))
((match-string 5) ; `face'
--- 346,356 ----
(sym (intern-soft data)))
(if sym
(cond
! ((match-string 3) ; `variable' &c
(and (boundp sym) ; `variable' doesn't ensure
; it's actually bound
(help-xref-button 8 'help-variable sym)))
! ((match-string 4) ; `function' &c
(and (fboundp sym) ; similarly
(help-xref-button 8 'help-function sym)))
((match-string 5) ; `face'
***************
*** 354,376 ****
(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))))
(help-xref-button 8 'help-function-def sym))
((and (boundp sym) (fboundp sym))
;; We can't intuit whether to use the
;; variable or function doc -- supply both.
(help-xref-button 8 'help-symbol sym))
! ((boundp sym)
(help-xref-button 8 'help-variable sym))
((fboundp sym)
! (help-xref-button 8 'help-function sym))
! ((facep sym)
! (help-xref-button 8 'help-face sym)))))))
;; An obvious case of a key substitution:
(save-excursion
(while (re-search-forward
--- 358,384 ----
(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))))
(help-xref-button 8 'help-function-def sym))
+ ((facep sym)
+ (if (save-match-data (looking-at "[ \t\n]+face\\W"))
+ (help-xref-button 8 'help-face sym)))
((and (boundp sym) (fboundp sym))
;; We can't intuit whether to use the
;; variable or function doc -- supply both.
(help-xref-button 8 'help-symbol sym))
! ((and
! (boundp sym)
! (documentation-property sym
! 'variable-documentation))
(help-xref-button 8 'help-variable sym))
((fboundp sym)
! (help-xref-button 8 'help-function sym)))))))
;; An obvious case of a key substitution:
(save-excursion
(while (re-search-forward
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/help-mode.el [lexbind],
Miles Bader <=