[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog startup.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog startup.el |
Date: |
Fri, 29 May 2009 01:31:57 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/05/29 01:31:56
Modified files:
lisp : ChangeLog startup.el
Log message:
(normal-no-mouse-startup-screen): Use F1 rather than C-h
if C-h is remapped to something else like DEL.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15661&r2=1.15662
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.530&r2=1.531
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15661
retrieving revision 1.15662
diff -u -b -r1.15661 -r1.15662
--- ChangeLog 26 May 2009 20:19:26 -0000 1.15661
+++ ChangeLog 29 May 2009 01:31:40 -0000 1.15662
@@ -1,7 +1,11 @@
+2009-05-29 Stefan Monnier <address@hidden>
+
+ * startup.el (normal-no-mouse-startup-screen): Use F1 rather than C-h
+ if C-h is remapped to something else like DEL.
+
2009-05-26 Chong Yidong <address@hidden>
- * edmacro.el (edmacro-parse-keys): Fix 2008-08-19
- change (Bug#3387).
+ * edmacro.el (edmacro-parse-keys): Fix 2008-08-19 change (Bug#3387).
* view.el (view-recenter): Allow recenter to compute window height
normally.
@@ -12,8 +16,8 @@
2009-05-26 Kenichi Handa <address@hidden>
- * textmodes/table.el (table--unibyte-char-to-multibyte): Function
- deleted.
+ * textmodes/table.el (table--unibyte-char-to-multibyte):
+ Delete function.
(*table--cell-self-insert-command, *table--cell-quoted-insert):
Don't call table--unibyte-char-to-multibyte (Bug#3372).
@@ -47,8 +51,8 @@
(grep-apply-setting): New function.
(grep-highlight-matches, grep-command, grep-template)
(grep-use-null-device, grep-find-command, grep-find-template):
- Clarify role of grep-compute-defaults in docstrings. Use
- grep-apply-setting to apply changes (Bug#3343).
+ Clarify role of grep-compute-defaults in docstrings.
+ Use grep-apply-setting to apply changes (Bug#3343).
2009-05-21 Glenn Morris <address@hidden>
Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -b -r1.530 -r1.531
--- startup.el 25 Apr 2009 14:25:09 -0000 1.530
+++ startup.el 29 May 2009 01:31:55 -0000 1.531
@@ -1824,6 +1824,11 @@
;; If keys have their default meanings,
;; use precomputed string to save lots of time.
+ (let ((c-h-accessible
+ ;; If normal-erase-is-backspace is used on a tty, there's
+ ;; no way to invoke C-h and you have to use F1 instead.
+ (or (not (char-table-p keyboard-translate-table))
+ (eq (aref keyboard-translate-table ?\C-h) ?\C-h))))
(if (and (eq (key-binding "\C-h") 'help-command)
(eq (key-binding "\C-xu") 'advertised-undo)
(eq (key-binding "\C-x\C-c") 'save-buffers-kill-terminal)
@@ -1831,34 +1836,33 @@
(eq (key-binding "\C-hi") 'info)
(eq (key-binding "\C-hr") 'info-emacs-manual)
(eq (key-binding "\C-h\C-n") 'view-emacs-news))
- (progn
+ (let ((help (if c-h-accessible "C-h" "<f1>")))
(insert "
-Get help\t C-h (Hold down CTRL and press h)
+Get help\t " help " (Hold down CTRL and press h)
")
(insert-button "Emacs manual"
'action (lambda (button) (info-emacs-manual))
'follow-link t)
- (insert " C-h r\t")
+ (insert " " help " r\t")
(insert-button "Browse manuals"
'action (lambda (button) (Info-directory))
'follow-link t)
- (insert "\t C-h i
+ (insert "\t " help " i
")
(insert-button "Emacs tutorial"
'action (lambda (button) (help-with-tutorial))
'follow-link t)
- (insert " C-h t\tUndo changes\t C-x u
+ (insert " " help " t\tUndo changes\t C-x u
")
(insert-button "Buy manuals"
'action (lambda (button) (view-order-manuals))
'follow-link t)
- (insert "\t C-h C-m\tExit Emacs\t C-x C-c"))
+ (insert "\t " help " C-m\tExit Emacs\t C-x C-c"))
(insert (format "
Get help\t %s
"
- (let ((where (where-is-internal
- 'help-command nil t)))
+ (let ((where (where-is-internal 'help-command nil t)))
(if where
(key-description where)
"M-x help"))))
@@ -1881,7 +1885,7 @@
'action (lambda (button) (view-order-manuals))
'follow-link t)
(insert (substitute-command-keys
- "\t \\[view-order-manuals]\tExit Emacs\t
\\[save-buffers-kill-terminal]")))
+ "\t \\[view-order-manuals]\tExit Emacs\t
\\[save-buffers-kill-terminal]"))))
;; Say how to use the menu bar with the keyboard.
(insert "\n")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog startup.el,
Stefan Monnier <=