diff options
author | Miles Bader <miles@gnu.org> | 2007-11-21 04:55:58 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-11-21 04:55:58 +0000 |
commit | d4aa48db8ed36b1fc7e7b0e6bd35049353f7f96e (patch) | |
tree | 4a8c1381059835b73876f59183e228a2fb740d59 /lisp | |
parent | 3d9bd2bc2806ecaf85f4474060a7fadfd00e61fd (diff) | |
parent | 33127d1a78f2a37d68ffa09642df2f38d78e95b1 (diff) | |
download | emacs-d4aa48db8ed36b1fc7e7b0e6bd35049353f7f96e.tar.gz |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-937
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 36 | ||||
-rw-r--r-- | lisp/add-log.el | 1 | ||||
-rw-r--r-- | lisp/bindings.el | 6 | ||||
-rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 | ||||
-rw-r--r-- | lisp/filecache.el | 4 | ||||
-rw-r--r-- | lisp/international/mule-cmds.el | 16 | ||||
-rw-r--r-- | lisp/mail/rmail.el | 4 | ||||
-rw-r--r-- | lisp/menu-bar.el | 14 | ||||
-rw-r--r-- | lisp/pcvs-parse.el | 7 | ||||
-rw-r--r-- | lisp/reposition.el | 2 | ||||
-rw-r--r-- | lisp/url/ChangeLog | 6 | ||||
-rw-r--r-- | lisp/url/url.el | 4 |
12 files changed, 78 insertions, 24 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34215cd55a7..31437fb1a38 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,39 @@ +2007-11-21 Eli Zaretskii <eliz@gnu.org> + + * international/mule-cmds.el (set-locale-environment): Set + default-file-name-coding-system _after_ keyboard and terminal + coding systems. This fixes last change. + + * mail/rmail.el (rmail-current-subject-regexp): Allow more than + one space after "Subject:". + +2007-11-21 Stefan Monnier <monnier@iro.umontreal.ca> + + * pcvs-parse.el (cvs-parse-table): Ignore errors when looking up files + in order to determine if there's a conflict. + +2007-11-21 Richard Stallman <rms@gnu.org> + + * bindings.el (esc-map): Bind C-M-l here; moved from reposition.el. + + * reposition.el (reposition-window): + Binding C-M-l moved to bindings.el. + + * bindings.el (ctl-x-4-map): Bind C-x 4 a here; moved from add-log.el. + + * add-log.el (add-change-log-entry-other-window): + Key binding C-x 4 a moved to bindings.el. + + * bindings.el (minibuffer-local-map): Bind C-tab here; moved + from filecache.el. + + * filecache.el: Minibuffer map bindings moved to bindings.el. + +2007-11-21 Jason Rumney <jasonr@gnu.org> + + * international/mule-cmds.el (set-locale-environment): + Set default-file-name-coding-system from system defaults on Windows. + 2007-11-21 Jason Rumney <jasonr@gnu.org> * term/w32console.el: New term init file for w32 console. diff --git a/lisp/add-log.el b/lisp/add-log.el index 21b4a5dbdc8..89aeafc75d6 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -664,7 +664,6 @@ the change log file in another window." (list current-prefix-arg (prompt-for-change-log-name)))) (add-change-log-entry whoami file-name t)) -;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) (defvar change-log-indent-text 0) diff --git a/lisp/bindings.el b/lisp/bindings.el index 52d7a6f6a59..ca9f03c4c7c 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -710,7 +710,8 @@ language you are using." ;; Override the global binding (which calls indent-relative via ;; indent-for-tab-command). The alignment that indent-relative tries to ;; do doesn't make much sense here since the prompt messes it up. - (define-key map "\t" 'self-insert-command)) + (define-key map "\t" 'self-insert-command) + (define-key minibuffer-local-map [C-tab] 'file-cache-minibuffer-complete)) (define-key global-map "\C-u" 'universal-argument) (let ((i ?0)) @@ -1079,6 +1080,9 @@ language you are using." (define-key ctl-x-map "z" 'repeat) +(define-key esc-map "\C-l" 'reposition-window) + +(define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) (define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window) ;; Signal handlers diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index f56e2544272..b021b8d9f1a 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -277,6 +277,8 @@ ;; Isn't it an error for `string' not to be unibyte?? --stef (if (fboundp 'string-as-unibyte) (setq string (string-as-unibyte string))) + ;; `byte-compile-splice-in-already-compiled-code' + ;; takes care of inlining the body. (cons `(lambda ,(aref fn 0) (byte-code ,string ,(aref fn 2) ,(aref fn 3))) (cdr form))) diff --git a/lisp/filecache.el b/lisp/filecache.el index 18c537fed7c..5138c947b7d 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -780,10 +780,6 @@ match REGEXP." ;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;###autoload (define-key minibuffer-local-completion-map [C-tab] 'file-cache-minibuffer-complete) -;;;###autoload (define-key minibuffer-local-map [C-tab] 'file-cache-minibuffer-complete) -;;;###autoload (define-key minibuffer-local-must-match-map [C-tab] 'file-cache-minibuffer-complete) - (provide 'filecache) ;;; arch-tag: 433d3ca4-4af2-47ce-b2cf-1f727460f538 diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index d61e1f31d8f..ca76d4f5054 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2619,14 +2619,24 @@ See also `locale-charset-language-names', `locale-language-names', (setq locale-coding-system coding-system)))) ;; On Windows, override locale-coding-system, - ;; keyboard-coding-system with system codepage. Note: - ;; selection-coding-system is already set in w32select.c. + ;; default-file-name-coding-system, keyboard-coding-system, + ;; terminal-coding-system with system codepage. (when (boundp 'w32-ansi-code-page) (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) (unless frame (setq locale-coding-system code-page-coding)) (set-keyboard-coding-system code-page-coding frame) - (set-terminal-coding-system code-page-coding frame)))) + (set-terminal-coding-system code-page-coding frame) + ;; Set default-file-name-coding-system last, so that Emacs + ;; doesn't try to use cpNNNN when it defines keyboard and + ;; terminal encoding. That's because the above two lines + ;; will want to load code-pages.el, where cpNNNN are + ;; defined; if default-file-name-coding-system were set to + ;; cpNNNN while these two lines run, Emacs will want to use + ;; it for encoding the file name it wants to load. And that + ;; will fail, since cpNNNN is not yet usable until + ;; code-pages.el finishes loading. + (setq default-file-name-coding-system code-page-coding)))) (when (eq system-type 'darwin) ;; On Darwin, file names are always encoded in utf-8, no matter diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index c999f687fbc..53296cfb0fe 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3282,7 +3282,9 @@ and more whitespace. The returned regular expressions contains (setq subject (regexp-quote subject)) (setq subject (replace-regexp-in-string "[ \t\n]+" "[ \t\n]+" subject t t)) - (concat "^Subject: " + ;; Some mailers insert extra spaces after "Subject:", so allow any + ;; amount of them. + (concat "^Subject:[ \t]+" (if (string= "\\`" (substring rmail-reply-regexp 0 2)) (substring rmail-reply-regexp 2) rmail-reply-regexp) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index ca20f6182fc..116d7842053 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1343,10 +1343,10 @@ key, a click, or a menu-item")) '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro :help "Read the Introduction to Emacs Lisp Programming")) -(define-key menu-bar-help-menu [describe-project] +(define-key menu-bar-help-menu [about-gnu-project] '(menu-item "About GNU" describe-project :help "About the GNU System, GNU Project, and GNU/Linux")) -(define-key menu-bar-help-menu [about] +(define-key menu-bar-help-menu [about-emacs] '(menu-item "About Emacs" about-emacs :help "Display version number, copyright info, and basic help")) (define-key menu-bar-help-menu [sep4] @@ -1357,7 +1357,7 @@ key, a click, or a menu-item")) (define-key menu-bar-help-menu [describe-copying] '(menu-item "Copying Conditions" describe-copying :help "Show the Emacs license (GPL)")) -(define-key menu-bar-help-menu [describe-distribution] +(define-key menu-bar-help-menu [getting-new-versions] '(menu-item "Getting New Versions" describe-distribution :help "How to get latest versions of Emacs")) (defun menu-bar-help-extra-packages () @@ -1369,10 +1369,10 @@ key, a click, or a menu-item")) (goto-address))) (define-key menu-bar-help-menu [sep2] '("--")) -(define-key menu-bar-help-menu [more] +(define-key menu-bar-help-menu [external-packages] '(menu-item "External Packages" menu-bar-help-extra-packages :help "Lisp packages distributed separately for use in Emacs")) -(define-key menu-bar-help-menu [finder-by-keyword] +(define-key menu-bar-help-menu [find-emacs-packages] '(menu-item "Find Emacs Packages" finder-by-keyword :help "Find packages and features by keyword")) (define-key menu-bar-help-menu [more-manuals] @@ -1386,10 +1386,10 @@ key, a click, or a menu-item")) (list 'menu-item "Search Documentation" menu-bar-search-documentation-menu)) (define-key menu-bar-help-menu [sep1] '("--")) -(define-key menu-bar-help-menu [eliza] +(define-key menu-bar-help-menu [emacs-psychotherapist] '(menu-item "Emacs Psychotherapist" doctor :help "Our doctor will help you feel better")) -(define-key menu-bar-help-menu [report-emacs-bug] +(define-key menu-bar-help-menu [send-emacs-bug-report] '(menu-item "Send Bug Report..." report-emacs-bug :help "Send e-mail to Emacs maintainers")) (define-key menu-bar-help-menu [emacs-known-problems] diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 3ca1829030f..7eb5c0b488f 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -235,7 +235,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; servers, this should not be necessary, because they return ;; a complete merge output. (with-temp-buffer - (insert-file-contents path) + (ignore-errors (insert-file-contents path)) (goto-char (point-min)) (if (re-search-forward "^<<<<<<< " nil t) 'CONFLICT 'NEED-MERGE)))) @@ -272,8 +272,9 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; branches, or because it's been removed). (if (ignore-errors (with-temp-buffer - (insert-file-contents (expand-file-name - ".cvsignore" (file-name-directory dir))) + (ignore-errors + (insert-file-contents + (expand-file-name ".cvsignore" (file-name-directory dir)))) (goto-char (point-min)) (re-search-forward (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$") diff --git a/lisp/reposition.el b/lisp/reposition.el index 3a5f24cbe8f..6ebbe57840d 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -171,8 +171,6 @@ first comment line visible (if point is in a comment)." ;;(repos-debug-macro "4") )))) -;;;###autoload (define-key esc-map "\C-l" 'reposition-window) - ;;; Auxiliary functions ;; Return number of screen lines between START and END. diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index e8ae7233c20..d5dd002cf7a 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -2,11 +2,15 @@ * url-mailto.el (mail-send-and-exit): * url-http.el (url-dav-file-attributes): - * url-file.el (ange-ftp-set-passwd, ange-ftp-copy-file-internal): + * url-file.el (ange-ftp-set-passwd, ange-ftp-copy-file-internal) (url-generate-unique-filename): Declare as functions. * url-privacy.el (url-device-type): Define unconditionally. +2007-11-15 Richard Stallman <rms@gnu.org> + + * url.el (url-retrieve-synchronously): Call delete-process. + 2007-10-31 Juanma Barranquero <lekktu@gmail.com> * url-vars.el (url-vars-unload-hook): Remove function and variable. diff --git a/lisp/url/url.el b/lisp/url/url.el index 3b292b4452d..c375a75e06f 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -241,7 +241,9 @@ no further processing). URL is either a string or a parsed URL." ;; XXX: The callback must always be called. Any ;; exception is a bug that should be fixed, not worked ;; around. - (setq retrieval-done t)) + (progn ;; Call delete-process so we run any sentinel now. + (delete-process proc) + (setq retrieval-done t))) ;; We used to use `sit-for' here, but in some cases it wouldn't ;; work because apparently pending keyboard input would always ;; interrupt it before it got a chance to handle process input. |