aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-02-23 16:39:24 +0000
committerStefan Monnier2006-02-23 16:39:24 +0000
commit4e6d317052ad617bd403077d391d4c86ba3aee07 (patch)
treedcb6dd570b07a95a652e31f1cbd5f7e111163ff8
parent31468dcbbaaf1f533ff4460c913cbe654fb0c0ac (diff)
downloademacs-4e6d317052ad617bd403077d391d4c86ba3aee07.tar.gz
emacs-4e6d317052ad617bd403077d391d4c86ba3aee07.zip
(describe-mode): Pass `mode-name' to format-mode-line.
-rw-r--r--lisp/ChangeLog22
-rw-r--r--lisp/help.el11
2 files changed, 17 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 601f4928a13..23c90421b89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-02-23 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * help.el (describe-mode): Pass `mode-name' to format-mode-line.
4
12006-02-23 Juanma Barranquero <lekktu@gmail.com> 52006-02-23 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * textmodes/org.el (org-xemacs-p) 7 * textmodes/org.el (org-xemacs-p)
@@ -16,8 +20,8 @@
16 (org-solidify-link-text): New function. 20 (org-solidify-link-text): New function.
17 (org-add-hook): Use `add-local-hook' instead of `make-local-hook' for 21 (org-add-hook): Use `add-local-hook' instead of `make-local-hook' for
18 XEmacs, just to silence the compiler. 22 XEmacs, just to silence the compiler.
19 (org-export-as-ascii, org-export-as-html-and-open): Use 23 (org-export-as-ascii, org-export-as-html-and-open):
20 `org-cleaned-string-for-export' and create internal links. 24 Use `org-cleaned-string-for-export' and create internal links.
21 (org-follow-mhe-link): Require mh-e, use folder. 25 (org-follow-mhe-link): Require mh-e, use folder.
22 26
232006-02-23 Nick Roberts <nickrob@snap.net.nz> 272006-02-23 Nick Roberts <nickrob@snap.net.nz>
@@ -64,7 +68,7 @@
64 option `org-export-table-remove-special-lines'. 68 option `org-export-table-remove-special-lines'.
65 (org-open-file): Allow special command configuration for 69 (org-open-file): Allow special command configuration for
66 directory link. 70 directory link.
67 (org-file-apps): Fixed bugs in customize type, added setting 71 (org-file-apps): Fix bugs in customize type, added setting
68 for directories. 72 for directories.
69 (org-activate-tags, org-format-agenda-item, org-complete) 73 (org-activate-tags, org-format-agenda-item, org-complete)
70 (org-get-tags-at, org-scan-tags, org-make-tags-matcher) 74 (org-get-tags-at, org-scan-tags, org-make-tags-matcher)
@@ -80,7 +84,7 @@
80 (org-store-link, org-insert-link): Use new option 84 (org-store-link, org-insert-link): Use new option
81 `org-file-link-context-use-camel-case'. 85 `org-file-link-context-use-camel-case'.
82 (org-activate-camels): Use new option `org-activate-camels'. 86 (org-activate-camels): Use new option `org-activate-camels'.
83 (org-link-regexp): Added mhe prefix. 87 (org-link-regexp): Add mhe prefix.
84 (org-open-at-point, org-store-link): Support for mhe links. 88 (org-open-at-point, org-store-link): Support for mhe links.
85 (org-mhe-get-message-real-folder, org-mhe-get-message-folder) 89 (org-mhe-get-message-real-folder, org-mhe-get-message-folder)
86 (org-mhe-get-message-folder-from-index, org-mhe-get-message-num) 90 (org-mhe-get-message-folder-from-index, org-mhe-get-message-num)
@@ -88,12 +92,12 @@
88 (org-remove-angle-brackets, org-add-angle-brackets): 92 (org-remove-angle-brackets, org-add-angle-brackets):
89 New functions. 93 New functions.
90 (org-bracket-link-regexp): New constant. 94 (org-bracket-link-regexp): New constant.
91 (org-read-date): Fixed bug that was rejecting all typed dates. 95 (org-read-date): Fix bug that was rejecting all typed dates.
92 (org-link-search): Make hierarchy above visible after a match. 96 (org-link-search): Make hierarchy above visible after a match.
93 (org-follow-bbdb-link): Inhibit electric mode for BBDB. 97 (org-follow-bbdb-link): Inhibit electric mode for BBDB.
94 (org-store-link): Fixed bug with link creation when cursor is in 98 (org-store-link): Fix bug with link creation when cursor is in
95 an empty line. 99 an empty line.
96 (org-open-at-point): Fixed bug with matching a link. 100 (org-open-at-point): Fix bug with matching a link.
97 Fixed buggy argument sequence in call to `org-view-tags'. 101 Fixed buggy argument sequence in call to `org-view-tags'.
98 (org-compile-prefix-format): Set `org-prefix-has-tag'. 102 (org-compile-prefix-format): Set `org-prefix-has-tag'.
99 (org-prefix-has-tag): New variable. 103 (org-prefix-has-tag): New variable.
@@ -157,8 +161,8 @@
157 161
1582006-02-20 Chong Yidong <cyd@stupidchicken.com> 1622006-02-20 Chong Yidong <cyd@stupidchicken.com>
159 163
160 * custom.el (customize-mark-to-save, customize-mark-as-set): Load 164 * custom.el (customize-mark-to-save, customize-mark-as-set):
161 the symbol first. 165 Load the symbol first.
162 166
1632006-02-20 Juanma Barranquero <lekktu@gmail.com> 1672006-02-20 Juanma Barranquero <lekktu@gmail.com>
164 168
diff --git a/lisp/help.el b/lisp/help.el
index f74293b8dd6..14de292dd13 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -835,8 +835,9 @@ follows the description of the major mode.)\n\n"))
835 ;; Document the major mode. 835 ;; Document the major mode.
836 (let ((mode mode-name)) 836 (let ((mode mode-name))
837 (with-current-buffer standard-output 837 (with-current-buffer standard-output
838 (insert mode) 838 (let ((start (point)))
839 (add-text-properties (- (point) (length mode)) (point) '(face bold)))) 839 (insert (format-mode-line mode))
840 (add-text-properties start (point) '(face bold)))))
840 (princ " mode:\n") 841 (princ " mode:\n")
841 (princ (documentation major-mode))) 842 (princ (documentation major-mode)))
842 (print-help-return-message)))) 843 (print-help-return-message))))
@@ -932,7 +933,7 @@ is currently activated with completion."
932;;; Automatic resizing of temporary buffers. 933;;; Automatic resizing of temporary buffers.
933 934
934(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2)) 935(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2))
935 "*Maximum height of a window displaying a temporary buffer. 936 "Maximum height of a window displaying a temporary buffer.
936This is the maximum height (in text lines) which `resize-temp-buffer-window' 937This is the maximum height (in text lines) which `resize-temp-buffer-window'
937will give to a window displaying a temporary buffer. 938will give to a window displaying a temporary buffer.
938It can also be a function which will be called with the object corresponding 939It can also be a function which will be called with the object corresponding
@@ -971,9 +972,5 @@ out of view."
971 (funcall temp-buffer-max-height (current-buffer)) 972 (funcall temp-buffer-max-height (current-buffer))
972 temp-buffer-max-height)))) 973 temp-buffer-max-height))))
973 974
974;; Provide this for the sake of define-minor-mode which generates
975;; defcustoms which require 'help'.
976(provide 'help)
977
978;; arch-tag: cf427352-27e9-49b7-9a6f-741ebab02423 975;; arch-tag: cf427352-27e9-49b7-9a6f-741ebab02423
979;;; help.el ends here 976;;; help.el ends here