HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lisp/emacs-lisp/bytecomp.el (byte-compile-catch)
[bpt/emacs.git]
/
lisp
/
man.el
diff --git
a/lisp/man.el
b/lisp/man.el
index
f448795
..
0b3ac53
100644
(file)
--- a/
lisp/man.el
+++ b/
lisp/man.el
@@
-1,7
+1,7
@@
;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
-;; Copyright (C) 1993
, 1994, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
-;;
2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
+;; Copyright (C) 1993
-1994, 1996-1997, 2001-2011
+;; Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Maintainer: FSF
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Maintainer: FSF
@@
-314,7
+314,7
@@
This regexp should not start with a `^' character.")
"Regular expression describing references to normal files.")
;; This includes the section as an optional part to catch hyphenated
"Regular expression describing references to normal files.")
;; This includes the section as an optional part to catch hyphenated
-;; refernces to manpages.
+;; refer
e
nces to manpages.
(defvar Man-hyphenated-reference-regexp
(concat "\\(" Man-name-regexp "\\)\\((\\(" Man-section-regexp "\\))\\)?")
"Regular expression describing a reference in the SEE ALSO section.")
(defvar Man-hyphenated-reference-regexp
(concat "\\(" Man-name-regexp "\\)\\((\\(" Man-section-regexp "\\))\\)?")
"Regular expression describing a reference in the SEE ALSO section.")
@@
-1154,7
+1154,9
@@
default type, `Man-xref-man-page' is used for the buttons."
(goto-char (point-min))
nil)))
(while (re-search-forward regexp end t)
(goto-char (point-min))
nil)))
(while (re-search-forward regexp end t)
- (make-text-button
+ ;; An overlay button is preferable because the underlying text
+ ;; may have text property highlights (Bug#7881).
+ (make-button
(match-beginning button-pos)
(match-end button-pos)
'type type
(match-beginning button-pos)
(match-end button-pos)
'type type
@@
-1674,7
+1676,8
@@
Specify which REFERENCE to use; default is based on word at point."
complete-path))
;;; Bookmark Man Support
complete-path))
;;; Bookmark Man Support
-(declare-function bookmark-make-record-default "bookmark" (&optional pos-only))
+(declare-function bookmark-make-record-default
+ "bookmark" (&optional no-file no-context posn))
(declare-function bookmark-prop-get "bookmark" (bookmark prop))
(declare-function bookmark-default-handler "bookmark" (bmk))
(declare-function bookmark-get-bookmark-record "bookmark" (bmk))
(declare-function bookmark-prop-get "bookmark" (bookmark prop))
(declare-function bookmark-default-handler "bookmark" (bmk))
(declare-function bookmark-get-bookmark-record "bookmark" (bmk))
@@
-1691,7
+1694,7
@@
Uses `Man-name-local-regexp'."
(defun Man-bookmark-make-record ()
"Make a bookmark entry for a Man buffer."
`(,(Man-default-bookmark-title)
(defun Man-bookmark-make-record ()
"Make a bookmark entry for a Man buffer."
`(,(Man-default-bookmark-title)
- ,@(bookmark-make-record-default '
point-only
)
+ ,@(bookmark-make-record-default '
no-file
)
(location . ,(concat "man " Man-arguments))
(man-args . ,Man-arguments)
(handler . Man-bookmark-jump)))
(location . ,(concat "man " Man-arguments))
(man-args . ,Man-arguments)
(handler . Man-bookmark-jump)))
@@
-1720,5
+1723,4
@@
Uses `Man-name-local-regexp'."
(provide 'man)
(provide 'man)
-;; arch-tag: 587cda76-8e23-4594-b1f3-89b6b09a0d47
;;; man.el ends here
;;; man.el ends here