diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/help-fns.el | 15 | ||||
| -rw-r--r-- | lisp/help.el | 11 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 32 |
4 files changed, 46 insertions, 20 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2ceb397723..ce3fe0ffd3d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-02-11 Drew Adams <drew.adams@oracle.com> + + * help.el (describe-key): Joined some split lines to facilitate + filling. + * help-fns.el (describe-function-1): Fill text of overlong lines. + 2008-02-12 Kenichi Handa <handa@ni.aist.go.jp> * Makefile.in (AUTOGENEL): Remove charprop.el and uni-*.el. @@ -25,6 +31,8 @@ 2008-02-11 Drew Adams <drew.adams@oracle.com> + * isearch.el: + (isearch-fail): New face. * isearch.el (isearch-fail): New face. (isearch-message): Highlight failure part of input. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 97591deb81b..d7886215880 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -267,7 +267,8 @@ face (according to `face-differs-from-default-p')." (symbol-function real-function) function)) file-name string - (beg (if (commandp def) "an interactive " "a "))) + (beg (if (commandp def) "an interactive " "a ")) + (pt1 (with-current-buffer (help-buffer) (point)))) (setq string (cond ((or (stringp def) (vectorp def)) @@ -348,8 +349,12 @@ face (according to `face-differs-from-default-p')." (re-search-backward "`\\([^`']+\\)'" nil t) (help-xref-button 1 'help-function-def real-function file-name)))) (princ ".") - (terpri) + (with-current-buffer (help-buffer) + (fill-region-as-paragraph (save-excursion (goto-char pt1) (forward-line 0) (point)) + (point))) + (terpri)(terpri) (when (commandp function) + (let ((pt2 (with-current-buffer (help-buffer) (point)))) (if (and (eq function 'self-insert-command) (eq (key-binding "a") 'self-insert-command) (eq (key-binding "b") 'self-insert-command) @@ -369,7 +374,7 @@ face (according to `face-differs-from-default-p')." (princ "'")) (when keys - (princ (if remapped " which is bound to " "It is bound to ")) + (princ (if remapped ", which is bound to " "It is bound to ")) ;; If lots of ordinary text characters run this command, ;; don't mention them one by one. (if (< (length non-modified-keys) 10) @@ -383,7 +388,9 @@ face (according to `face-differs-from-default-p')." (princ "many ordinary text characters")))) (when (or remapped keys non-modified-keys) (princ ".") - (terpri))))) + (terpri)))) + (with-current-buffer (help-buffer) (fill-region-as-paragraph pt2 (point))) + (terpri))) (let* ((arglist (help-function-arglist def)) (doc (documentation function)) (usage (help-split-fundoc doc function))) diff --git a/lisp/help.el b/lisp/help.el index 24f1e74d71a..5260ffc9279 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -745,8 +745,7 @@ temporarily enables it to allow getting help on disabled items and buttons." (with-help-window (help-buffer) (princ (help-key-description key untranslated)) (princ (format "\ -%s runs the command %S - which is " +%s runs the command %S, which is " mouse-msg defn)) (describe-function-1 defn) (when up-event @@ -757,12 +756,11 @@ temporarily enables it to allow getting help on disabled items and buttons." ----------------- up-event %s---------------- -<%S>%s%s runs the command %S - which is " +<%S>%s%s runs the command %S, which is " (if mouse-1-tricky "(short click) " "") ev-type mouse-msg (if mouse-1-remapped - " is remapped to <mouse-2>\nwhich" "") + " is remapped to <mouse-2>, which" "") defn-up)) (describe-function-1 defn-up)) (unless (or (null defn-up-tricky) @@ -773,8 +771,7 @@ temporarily enables it to allow getting help on disabled items and buttons." ----------------- up-event (long click) ---------------- Pressing <%S>%s for longer than %d milli-seconds -runs the command %S - which is " +runs the command %S, which is " ev-type mouse-msg mouse-1-click-follows-link defn-up-tricky)) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index ed434ad75cb..9570ab3b4ea 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -345,6 +345,19 @@ See also `rmail-highlight-face'." face) :group 'rmail-headers) +(defface rmail-header-name + '((t (:inherit font-lock-function-name-face))) + "Face to use for highlighting the header names." + :group 'rmail-headers + :version "23.1") + +;;;###autoload +(defcustom rmail-header-name-face 'rmail-header-name "\ +*Face to use for highlighting the header names." + :type '(choice (const :tag "Default" nil) + face) + :group 'rmail-headers) + ;;;###autoload (defcustom rmail-delete-after-output nil "\ *Non-nil means automatically delete a message that is copied to a file." @@ -698,19 +711,19 @@ The first parenthesized expression should match the MIME-charset name.") "\n")) nil) -(defvar rmail-font-lock-keywords +(setq rmail-font-lock-keywords ;; These are all matched case-insensitively. - (eval-when-compile + ;;(eval-when-compile (let* ((cite-chars "[>|}]") (cite-prefix "a-z") (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) (list '("^\\(From\\|Sender\\|Resent-From\\):" - . font-lock-function-name-face) - '("^Reply-To:.*$" . font-lock-function-name-face) - '("^Subject:" . font-lock-comment-face) - '("^X-Spam-Status:" . font-lock-keyword-face) + . 'rmail-header-name) + '("^Reply-To:.*$" . 'rmail-header-name) + '("^Subject:" . 'rmail-header-name) + '("^X-Spam-Status:" . 'rmail-header-name) '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):" - . font-lock-keyword-face) + . 'rmail-header-name) ;; Use MATCH-ANCHORED to effectively anchor the regexp left side. `(,cite-chars (,(concat "\\=[ \t]*" @@ -721,8 +734,9 @@ The first parenthesized expression should match the MIME-charset name.") (1 font-lock-comment-delimiter-face nil t) (5 font-lock-comment-face nil t))) '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$" - . font-lock-string-face)))) - "Additional expressions to highlight in Rmail mode.") + . 'rmail-header-name)))) +;;) +;; "Additional expressions to highlight in Rmail mode.") ;; Perform BODY in the summary buffer ;; in such a way that its cursor is properly updated in its own window. |