From c317b5634ab58ae6c7c9f30008bf95205314c1d6 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 16 Dec 2007 05:04:28 +0000 Subject: [PATCH 01/41] Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-164 --- lisp/gnus/ChangeLog | 13 +++++++++++++ lisp/gnus/gnus-sum.el | 10 +++++----- man/ChangeLog | 4 ++++ man/gnus.texi | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index aa410f541bd..83449d6f005 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,16 @@ +2007-12-14 Johan Bockg,Ae(Brd + + * gnus-sum.el (gnus-summary-mark-unread-as-read) + (gnus-summary-mark-read-and-unread-as-read) + (gnus-summary-mark-current-read-and-unread-as-read) + (gnus-summary-mark-unread-as-ticked): Doc fix. + `gnus-mark-article-hook', not `gnus-summary-mark-article-hook'. + +2007-12-14 Reiner Steib + + * gnus-sum.el (gnus-summary-prev-article): Fix doc string. Reported by + Christoph Conrad . + 2007-12-03 Reiner Steib * message.el (message-ignored-supersedes-headers): Add "X-ID". diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 96f7ea11c5d..7b65743aac5 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7492,7 +7492,7 @@ If BACKWARD, the previous article is selected instead of the next." (gnus-summary-article-subject)))) (defun gnus-summary-prev-article (&optional unread subject) - "Select the article after the current one. + "Select the article before the current one. If UNREAD is non-nil, only unread articles are selected." (interactive "P") (gnus-summary-next-article unread subject t)) @@ -10393,12 +10393,12 @@ The difference between N and the number of marks cleared is returned." (gnus-summary-mark-forward (- n) gnus-unread-mark)) (defun gnus-summary-mark-unread-as-read () - "Intended to be used by `gnus-summary-mark-article-hook'." + "Intended to be used by `gnus-mark-article-hook'." (when (memq gnus-current-article gnus-newsgroup-unreads) (gnus-summary-mark-article gnus-current-article gnus-read-mark))) (defun gnus-summary-mark-read-and-unread-as-read (&optional new-mark) - "Intended to be used by `gnus-summary-mark-article-hook'." + "Intended to be used by `gnus-mark-article-hook'." (let ((mark (gnus-summary-article-mark))) (when (or (gnus-unread-mark-p mark) (gnus-read-mark-p mark)) @@ -10406,7 +10406,7 @@ The difference between N and the number of marks cleared is returned." (or new-mark gnus-read-mark))))) (defun gnus-summary-mark-current-read-and-unread-as-read (&optional new-mark) - "Intended to be used by `gnus-summary-mark-article-hook'." + "Intended to be used by `gnus-mark-article-hook'." (let ((mark (gnus-summary-article-mark))) (when (or (gnus-unread-mark-p mark) (gnus-read-mark-p mark)) @@ -10414,7 +10414,7 @@ The difference between N and the number of marks cleared is returned." (or new-mark gnus-read-mark))))) (defun gnus-summary-mark-unread-as-ticked () - "Intended to be used by `gnus-summary-mark-article-hook'." + "Intended to be used by `gnus-mark-article-hook'." (when (memq gnus-current-article gnus-newsgroup-unreads) (gnus-summary-mark-article gnus-current-article gnus-ticked-mark))) diff --git a/man/ChangeLog b/man/ChangeLog index 7a3253b31c5..c6fab4340b8 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2007-12-14 Sven Joachim + + * gnus.texi (Score Variables): Fix typo. + 2007-12-15 Richard Stallman * files.texi (Auto Save): Clarify definition of auto-saving. diff --git a/man/gnus.texi b/man/gnus.texi index bcced071cc2..5ced5e29a99 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -19900,7 +19900,7 @@ Suffix to add to the group name to arrive at the score file name @vindex gnus-score-uncacheable-files @cindex score cache All score files are normally cached to avoid excessive re-loading of -score files. However, if this might make your Emacs grow big and +score files. However, this might make your Emacs grow big and bloated, so this regexp can be used to weed out score files unlikely to be needed again. It would be a bad idea to deny caching of @file{all.SCORE}, while it might be a good idea to not cache From a313b2911a3a5e9ef76daec103b716ad11a607cf Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 17 Dec 2007 01:50:42 +0000 Subject: [PATCH 02/41] (w32_wnd_proc) : Cast char to unsigned before passing as wParam. --- src/ChangeLog | 5 +++++ src/w32fns.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2bf4e0ed15f..a5b34e38966 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Jason Rumney + + * w32fns.c (w32_wnd_proc) : Cast char to unsigned + before passing as wParam. + 2007-12-14 Jason Rumney * w32term.c (w32_read_socket): Use MULTIBYTE_CHAR_KEYSTROKE_EVENT diff --git a/src/w32fns.c b/src/w32fns.c index 9492989e735..44087329c78 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3129,7 +3129,8 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) { /* Forward asciified character sequence. */ post_character_message - (hwnd, WM_CHAR, key.uChar.AsciiChar, lParam, + (hwnd, WM_CHAR, + (unsigned char) key.uChar.AsciiChar, lParam, w32_get_key_modifiers (wParam, lParam)); w32_kbd_patch_key (&key); } From d55f5fcfc2170d91942958189d8294274f278057 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 17 Dec 2007 09:03:46 +0000 Subject: [PATCH 03/41] (defcustom-c-stylevar): Remove debugging message. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/cc-vars.el | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1de9482c041..69dbb8c6ff6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Thien-Thi Nguyen + + * progmodes/cc-vars.el (defcustom-c-stylevar): + Remove debugging message. Reported by Eli Zaretskii. + 2007-12-15 Richard Stallman * emacs-lisp/find-func.el (find-function-after-hook): Add :type. diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index fcfdbc53bb4..c071569d694 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -188,7 +188,6 @@ the value set here overrides the style system (there is a variable (aggregate `'(radio (const :tag "Use style settings" set-from-style) ,(cons head newt)))) - (message "aggregate: %S" aggregate) `(progn (c-set-stylevar-fallback ',name ,val) (custom-declare-variable From 1fae03f2535883b149ef927bcfdd0b251314268a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 17 Dec 2007 09:16:57 +0000 Subject: [PATCH 04/41] (defcustom-c-stylevar): Revert to pre-2007-12-12 version. --- lisp/ChangeLog | 2 +- lisp/progmodes/cc-vars.el | 58 ++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69dbb8c6ff6..a3ae2a10c55 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ 2007-12-17 Thien-Thi Nguyen * progmodes/cc-vars.el (defcustom-c-stylevar): - Remove debugging message. Reported by Eli Zaretskii. + Revert to pre-2007-12-12 version. 2007-12-15 Richard Stallman diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index c071569d694..76b0e5a898c 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -156,44 +156,34 @@ Useful as last item in a `choice' widget." (setq c-fallback-style (cons (cons name val) c-fallback-style))) (defmacro defcustom-c-stylevar (name val doc &rest args) - "Define a style variable NAME with VAL and DOC. -More precisely, convert the given `:type FOO', mined out of ARGS, -to an aggregate `:type (radio STYLE (PREAMBLE FOO))', append some -some boilerplate documentation to DOC, arrange for the fallback -value of NAME to be VAL, and call `custom-declare-variable' to -do the rest of the work. - -STYLE stands for the choice where the value is taken from some -style setting. PREAMBLE is optionally prepended to FOO; that is, -if FOO contains :tag or :value, the respective two-element list -component is ignored." - (declare (debug (symbolp form stringp &rest))) - (let* ((expanded-doc (concat doc " + "Defines a style variable." + `(let ((-value- ,val)) + (c-set-stylevar-fallback ',name -value-) + (custom-declare-variable + ',name ''set-from-style + ,(concat doc " This is a style variable. Apart from the valid values described -above, it can be set to the symbol `set-from-style'. In that case, -it takes its value from the style system (see `c-default-style' and +above, it can be set to the symbol `set-from-style'. In that case, it +takes its value from the style system (see `c-default-style' and `c-style-alist') when a CC Mode buffer is initialized. Otherwise, the value set here overrides the style system (there is a variable -`c-old-style-variable-behavior' that changes this, though).")) - (typ (eval (plist-get args :type))) - (type (if (consp typ) typ (list typ))) - (head (car type)) - (tail (cdr type)) - (newt (append (unless (plist-get tail :tag) - '(:tag "Override style settings")) - (unless (plist-get tail :value) - `(:value ,val)) - tail)) - (aggregate `'(radio - (const :tag "Use style settings" set-from-style) - ,(cons head newt)))) - `(progn - (c-set-stylevar-fallback ',name ,val) - (custom-declare-variable - ',name ''set-from-style - ,expanded-doc - ,@(plist-put args :type aggregate))))) +`c-old-style-variable-behavior' that changes this, though).") + ,@(plist-put + args ':type + `(` (radio + (const :tag "Use style settings" + set-from-style) + ,(, (let ((type (eval (plist-get args ':type)))) + (unless (consp type) + (setq type (list type))) + (unless (c-safe (plist-get (cdr type) ':value)) + (setcdr type (append '(:value (, -value-)) + (cdr type)))) + (unless (c-safe (plist-get (cdr type) ':tag)) + (setcdr type (append '(:tag "Override style settings") + (cdr type)))) + (bq-process type))))))))) (defun c-valid-offset (offset) "Return non-nil if OFFSET is a valid offset for a syntactic symbol. From 3283b167acf1d5cca87090a0f32a1ec5cd106abb Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 19 Dec 2007 17:02:10 +0000 Subject: [PATCH 05/41] (all): Use correct group name for members of mode-line group. --- lisp/ChangeLog | 5 +++++ lisp/cus-start.el | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3ae2a10c55..93205ede868 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-19 Martin Rudalics + + * cus-start.el (all): Use correct group name for members of + mode-line group. + 2007-12-17 Thien-Thi Nguyen * progmodes/cc-vars.el (defcustom-c-stylevar): diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 1e2dd6c57af..d56d9d114bc 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -42,7 +42,7 @@ (gc-cons-threshold alloc integer) (garbage-collection-messages alloc boolean) ;; buffer.c - (mode-line-format modeline sexp) ;Hard to do right. + (mode-line-format mode-line sexp) ;Hard to do right. (default-major-mode internal function) (enable-multibyte-characters mule boolean) (case-fold-search matching boolean) @@ -355,8 +355,8 @@ since it could result in memory overflow and make Emacs crash." (hscroll-margin windows integer "22.1") (hscroll-step windows number "22.1") (truncate-partial-width-windows display boolean) - (mode-line-inverse-video modeline boolean) - (mode-line-in-non-selected-windows modeline boolean "22.1") + (mode-line-inverse-video mode-line boolean) + (mode-line-in-non-selected-windows mode-line boolean "22.1") (line-number-display-limit display (choice integer (const :tag "No limit" nil))) From 888b59787114c5d931935c49efd9861e8fa382d3 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 21 Dec 2007 10:19:54 +0000 Subject: [PATCH 06/41] (auto-insert-alist): Remove nonsensical precision specifier from format-string. --- lisp/ChangeLog | 5 +++++ lisp/autoinsert.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 93205ede868..c11137f87f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-21 Martin Rudalics + + * autoinsert.el (auto-insert-alist): Remove nonsensical precision + specifier from format-string. Reported by Ye Wenbin. + 2007-12-19 Martin Rudalics * cus-start.el (all): Use correct group name for members of diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 805065ba009..4d2be1c94e0 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -179,7 +179,7 @@ If this contains a %s, that will be replaced by the matching rule." ;;'(setq v1 (apply 'vector (mapcar 'car finder-known-keywords))) '(setq v1 (mapcar (lambda (x) (list (symbol-name (car x)))) finder-known-keywords) - v2 (mapconcat (lambda (x) (format "%10.0s: %s" (car x) (cdr x))) + v2 (mapconcat (lambda (x) (format "%12s: %s" (car x) (cdr x))) finder-known-keywords "\n")) ((let ((minibuffer-help-form v2)) From d1dbc07ca2eba99092e9dd55ed78e70b295836d7 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 21 Dec 2007 10:32:38 +0000 Subject: [PATCH 07/41] (find-name-arg): New custom variable. (find-name-dired): Use it. (find-dired-find-program): Remove. (find-dired): Use find-program. (find-grep-dired): Use grep-program. --- lisp/find-dired.el | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/lisp/find-dired.el b/lisp/find-dired.el index 0a3de850762..8a8304c6763 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -36,11 +36,6 @@ :group 'dired :prefix "find-") -(defcustom find-dired-find-program "find" - "Program used to find files." - :group 'dired - :type 'file) - ;; find's -ls corresponds to these switches. ;; Note -b, at least GNU find quotes spaces etc. in filenames ;;;###autoload @@ -77,6 +72,18 @@ On other systems, the closest you can come is to use `-l'." :type 'string :group 'find-dired) +;;;###autoload +(defcustom find-name-arg + (if read-file-name-completion-ignore-case + "-iname" + "-name") + "*Argument used to specify file name pattern. +If `read-file-name-completion-ignore-case' is non-nil, -iname is used so that +find also ignores case. Otherwise, -name is used." + :type 'string + :group 'find-dired + :version "22.2") + (defvar find-args nil "Last arguments given to `find' by \\[find-dired].") @@ -126,7 +133,7 @@ as the final argument." (erase-buffer) (setq default-directory dir find-args args ; save for next interactive call - args (concat find-dired-find-program " . " + args (concat find-program " . " (if (string= args "") "" (concat @@ -198,7 +205,7 @@ The command run (after changing into DIR) is find . -name 'PATTERN' -ls" (interactive "DFind-name (directory): \nsFind-name (filename wildcard): ") - (find-dired dir (concat "-name " (shell-quote-argument pattern)))) + (find-dired dir (concat find-name-arg " " (shell-quote-argument pattern)))) ;; This functionality suggested by ;; From: oblanc@watcgl.waterloo.edu (Olivier Blanc) @@ -222,7 +229,7 @@ Thus ARG can also contain additional grep options." ;; by FIFOs and devices. I'm not sure what's best to do ;; about symlinks, so as far as I know this is not wrong. (find-dired dir - (concat "-type f -exec grep " find-grep-options " -e " + (concat "-type f -exec " grep-program " " find-grep-options " -e " (shell-quote-argument regexp) " " (shell-quote-argument "{}") From 34fac407db7653a740a7aca123b574e793de0d66 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 21 Dec 2007 10:32:55 +0000 Subject: [PATCH 08/41] (rgrep): Use find-name-arg. --- lisp/progmodes/grep.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index baa59c764fd..ecc386404c6 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -750,10 +750,10 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]." grep-find-template regexp (concat (shell-quote-argument "(") - " -name " + " " find-name-arg " " (mapconcat #'shell-quote-argument (split-string files) - " -o -name ") + " -o " find-name-arg " ") " " (shell-quote-argument ")")) dir From f11e807991c5988c221bb6868a081b2c32d0d234 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 21 Dec 2007 10:41:17 +0000 Subject: [PATCH 09/41] *** empty log message *** --- lisp/ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c11137f87f2..8e474a7f0b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2007-12-21 Jason Rumney + + * find-dired.el (find-name-arg): New custom variable. + (find-name-dired): Use it. + (find-dired-find-program): Remove. + (find-dired): Use find-program. + (find-grep-dired): Use grep-program. + + * progmodes/grep.el (rgrep): Use find-name-arg. + 2007-12-21 Martin Rudalics * autoinsert.el (auto-insert-alist): Remove nonsensical precision From 55a3770f705e4c21a8eef139eb0feec456917314 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 22 Dec 2007 16:23:36 +0000 Subject: [PATCH 10/41] (comint-password-prompt-regexp): Match `Enter Password'. --- lisp/ChangeLog | 7 +++++-- lisp/comint.el | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8e474a7f0b9..fb6fbe1da23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-12-22 Richard Stallman + + * comint.el (comint-password-prompt-regexp): Match `Enter Password'. + 2007-12-21 Jason Rumney * find-dired.el (find-name-arg): New custom variable. @@ -15,8 +19,7 @@ 2007-12-19 Martin Rudalics - * cus-start.el (all): Use correct group name for members of - mode-line group. + * cus-start.el: Use correct group name for members of mode-line group. 2007-12-17 Thien-Thi Nguyen diff --git a/lisp/comint.el b/lisp/comint.el index ed1f38bf1a1..047cc3b80fb 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -336,8 +336,9 @@ This variable is buffer-local." ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. ;; Ubuntu's sudo prompts like `[sudo] password for user:' ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. +;; Something called "perforce" uses "Enter password:". (defcustom comint-password-prompt-regexp - "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ + "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ \[Pp]assword\\( (again)\\)?\\|\ pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ From 7d11dd8142b96190c6c84c84e14b2b29d527919f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 22 Dec 2007 17:05:42 +0000 Subject: [PATCH 11/41] (Getting Started): Change @ref to @pxref. --- man/cc-mode.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/cc-mode.texi b/man/cc-mode.texi index af16e6553f2..61c2a1c493e 100644 --- a/man/cc-mode.texi +++ b/man/cc-mode.texi @@ -487,8 +487,8 @@ work just fine right out of the box. Note however that you might not have the latest @ccmode{} release and might want to upgrade your copy (see below). -You should probably start by skimming through the entire chapter -@ref{Commands} to get an overview of @ccmode{}'s capabilities. +You should probably start by skimming through the entire Commands chapter +(@pxref{Commands}) to get an overview of @ccmode{}'s capabilities. After trying out some commands, you may dislike some aspects of @ccmode{}'s default configuration. Here is an outline of how to From 426aa4f0befa3e768687820159476c5d815b8a16 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:08:03 +0000 Subject: [PATCH 12/41] (file-name-history): Add reference to `history-length' in the doc string. --- lisp/files.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/files.el b/lisp/files.el index 09d020533f5..423bc1eb804 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -516,7 +516,10 @@ using \\[toggle-read-only]." :group 'view) (defvar file-name-history nil - "History list of file names entered in the minibuffer.") + "History list of file names entered in the minibuffer. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (put 'ange-ftp-completion-hook-function 'safe-magic t) (defun ange-ftp-completion-hook-function (op &rest args) From 6f5d24524adc3a4388818d5e8a859b5c00ba7d2f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:08:49 +0000 Subject: [PATCH 13/41] (input-method-history): Add reference to `history-length' in the doc string. --- lisp/international/mule-cmds.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 19663f594b9..2eaaaa79ef2 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1336,7 +1336,10 @@ This is the input method activated automatically by the command (put 'input-method-function 'permanent-local t) (defvar input-method-history nil - "History list for some commands that read input methods.") + "History list of input methods read from the minibuffer. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (make-variable-buffer-local 'input-method-history) (put 'input-method-history 'permanent-local t) From fae97ed8b8861e68394170f5a5a6938e14118cf0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:10:17 +0000 Subject: [PATCH 14/41] (regexp-history): Add reference to `history-length' in the doc string. --- lisp/ChangeLog | 8 ++++++++ lisp/replace.el | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb6fbe1da23..60bbc2b7914 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-12-22 Eli Zaretskii + + * replace.el (regexp-history): + * simple.el (minibuffer-history): + * international/mule-cmds.el (input-method-history): + * files.el (file-name-history): Add reference to history-length in + the doc string. + 2007-12-22 Richard Stallman * comint.el (comint-password-prompt-regexp): Match `Enter Password'. diff --git a/lisp/replace.el b/lisp/replace.el index ebee65b2f40..9134f6881cc 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -513,7 +513,10 @@ which will run faster and will not set the mark or print anything." (defvar regexp-history nil - "History list for some commands that read regular expressions.") + "History list for some commands that read regular expressions. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (defalias 'delete-non-matching-lines 'keep-lines) From e5f0c02f8ef2a549ccc88a29792fcceab9625abf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:12:30 +0000 Subject: [PATCH 15/41] (minibuffer-history, shell-command-history): Add references to history-length in the doc strings. --- lisp/simple.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 551c93b773a..8c97cec2a6c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1156,7 +1156,10 @@ to get different commands to edit and resubmit." (defvar minibuffer-history nil "Default minibuffer history list. This is used for all minibuffer input -except when an alternate history list is specified.") +except when an alternate history list is specified. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (defvar minibuffer-history-sexp-flag nil "Control whether history list elements are expressions or strings. If the value of this variable equals current minibuffer depth, @@ -1748,7 +1751,10 @@ You can disable the popping up of this buffer by adding the entry t)) (defvar shell-command-history nil - "History list for some commands that read shell commands.") + "History list for some commands that read shell commands. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (defvar shell-command-switch "-c" "Switch used to have the shell execute its command line argument.") From 987ec16d97ad51fc31913f1709e9d1cb4f911510 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:15:48 +0000 Subject: [PATCH 16/41] (set-variable-value-history): Add reference to history-length in the doc string. --- lisp/ChangeLog | 3 ++- lisp/simple.el | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60bbc2b7914..cafe756be54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,8 @@ 2007-12-22 Eli Zaretskii + * simple.el (minibuffer-history, shell-command-history) + (set-variable-value-history): * replace.el (regexp-history): - * simple.el (minibuffer-history): * international/mule-cmds.el (input-method-history): * files.el (file-name-history): Add reference to history-length in the doc string. diff --git a/lisp/simple.el b/lisp/simple.el index 8c97cec2a6c..d413e927a85 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4782,7 +4782,10 @@ Each action has the form (FUNCTION . ARGS)." 'switch-to-buffer-other-frame yank-action send-actions)) (defvar set-variable-value-history nil - "History of values entered with `set-variable'.") + "History of values entered with `set-variable'. + +Maximum length of the history list is determined by the value +of `history-length', which see.") (defun set-variable (variable value &optional make-local) "Set VARIABLE to VALUE. VALUE is a Lisp object. From b014713ca63fcc6604b80159aaad46f6219ca62c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:20:55 +0000 Subject: [PATCH 17/41] (syms_of_callint) : Add reference to history-length in the doc string. --- src/ChangeLog | 5 +++++ src/callint.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a5b34e38966..284bca33828 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-12-22 Eli Zaretskii + + * callint.c (syms_of_callint) : Add reference to + history-length in the doc string. + 2007-12-17 Jason Rumney * w32fns.c (w32_wnd_proc) : Cast char to unsigned diff --git a/src/callint.c b/src/callint.c index 9dcc077fd65..65ef8aacadb 100644 --- a/src/callint.c +++ b/src/callint.c @@ -960,7 +960,10 @@ This is what `(interactive \"P\")' returns. */); DEFVAR_LISP ("command-history", &Vcommand_history, doc: /* List of recent commands that read arguments from terminal. -Each command is represented as a form to evaluate. */); +Each command is represented as a form to evaluate. + +Maximum length of the history list is determined by the value +of `history-length', which see. */); Vcommand_history = Qnil; DEFVAR_LISP ("command-debug-status", &Vcommand_debug_status, From ca88f0a5c8d0ff8c84848b891fc2c6f3af5bb36c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 17:34:14 +0000 Subject: [PATCH 18/41] Mention -iname usage in find-dired. --- etc/NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index d850556e9d6..04d6b64c63f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -44,6 +44,11 @@ below. Emacs tries to warn you about these through `bad-packages-alist'. * Changes in Emacs 22.2 +** `find-name-dired' now uses -iname rather than -name +for case-insensitive filesystems. The default behavior is determined +by the value of `read-file-name-completion-ignore-case'; if you don't +like that, customize the value of the new option `find-name-arg'. + ** In Image mode, whenever the displayed image is wider and/or higher than the window, the usual keys for moving the cursor cause the image to be scrolled horizontally or vertically instead. From abfd019136c55d6a133ac44ea40f55190ef2cfa3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 22 Dec 2007 20:21:06 +0000 Subject: [PATCH 19/41] (Query Replace): Make exp of query-replace more self-contained, and clarify. --- man/ChangeLog | 7 +++++++ man/search.texi | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/man/ChangeLog b/man/ChangeLog index c6fab4340b8..8921b4480b3 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,10 @@ +2007-12-22 Richard Stallman + + * search.texi (Query Replace): Make exp of query-replace more + self-contained, and clarify. + + * cc-mode.texi (Getting Started): Change @ref to @pxref. + 2007-12-14 Sven Joachim * gnus.texi (Score Variables): Fix typo. diff --git a/man/search.texi b/man/search.texi index 1a8a6372ba2..48af28fa441 100644 --- a/man/search.texi +++ b/man/search.texi @@ -1152,13 +1152,12 @@ Replace some matches for @var{regexp} with @var{newstring}. @kindex M-% @findex query-replace If you want to change only some of the occurrences of @samp{foo} to -@samp{bar}, not all of them, then you cannot use an ordinary -@code{replace-string}. Instead, use @kbd{M-%} (@code{query-replace}). +@samp{bar}, not all of them, use @kbd{M-%} (@code{query-replace}). This command finds occurrences of @samp{foo} one by one, displays each occurrence and asks you whether to replace it. Aside from querying, -@code{query-replace} works just like @code{replace-string}. It -preserves case, like @code{replace-string}, provided -@code{case-replace} is non-@code{nil}, as it normally is +@code{query-replace} works just like @code{replace-string} +(@pxref{Unconditional Replace}). In particular, it preserves case +provided @code{case-replace} is non-@code{nil}, as it normally is (@pxref{Replacement and Case}). A numeric argument means consider only occurrences that are bounded by word-delimiter characters. From 8f13498885ef13c53aebbcbeee48ff50aa8cd8e9 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 23 Dec 2007 06:00:36 +0000 Subject: [PATCH 20/41] (mac-apple-event-map): Bind kHICommandAbout event to `about-emacs' instead of `display-splash-screen'. --- lisp/ChangeLog | 5 +++++ lisp/term/mac-win.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cafe756be54..3d14786d375 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-23 David Reitter + + * term/mac-win.el (mac-apple-event-map): Bind kHICommandAbout event to + `about-emacs' instead of `display-splash-screen'. + 2007-12-22 Eli Zaretskii * simple.el (minibuffer-history, shell-command-history) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 483e73464dc..b147241b902 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1777,7 +1777,7 @@ Currently the `mailto' scheme is supported." (define-key mac-apple-event-map [internet-event get-url] 'mac-ae-get-url) -(define-key mac-apple-event-map [hi-command about] 'display-splash-screen) +(define-key mac-apple-event-map [hi-command about] 'about-emacs) ;;; Converted Carbon Events (defun mac-handle-toolbar-switch-mode (event) From 585a8772d5baf90ae9c85d046153e800a3f60235 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 23 Dec 2007 06:01:51 +0000 Subject: [PATCH 21/41] (fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5 about not changing Help menu title. --- src/ChangeLog | 5 +++++ src/macmenu.c | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 284bca33828..fa3d8e78b05 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-12-23 YAMAMOTO Mitsuharu + + * macmenu.c (fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5 + about not changing Help menu title. + 2007-12-22 Eli Zaretskii * callint.c (syms_of_callint) : Add reference to diff --git a/src/macmenu.c b/src/macmenu.c index b8cfd6a4d2f..c7b63917a4c 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -3174,7 +3174,22 @@ fill_menubar (wv, deep_p) GetMenuTitle (menu, old_title); if (!EqualString (title, old_title, false, false)) - SetMenuTitle (menu, title); + { +#ifdef MAC_OSX + if (id + 1 == min_menu_id[MAC_MENU_MENU_BAR + 1] + || GetMenuRef (id + 1) == NULL) + { + /* This is a workaround for Mac OS X 10.5 where just + calling SetMenuTitle fails to change the title of + the last (Help) menu in the menu bar. */ + DeleteMenu (id); + DisposeMenu (menu); + menu = NULL; + } + else +#endif /* MAC_OSX */ + SetMenuTitle (menu, title); + } #else /* !TARGET_API_MAC_CARBON */ if (!EqualString (title, (*menu)->menuData, false, false)) { @@ -3186,7 +3201,8 @@ fill_menubar (wv, deep_p) } #endif /* !TARGET_API_MAC_CARBON */ } - else + + if (!menu) { menu = NewMenu (id, title); InsertMenu (menu, 0); From 90e12e78d6dc78da17e2a15ed763a9f1cad6f333 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 23 Dec 2007 06:10:04 +0000 Subject: [PATCH 22/41] Fix author and entry as the corresponding change is already made in the trunk. --- lisp/ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d14786d375..1d9355aa928 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ -2007-12-23 David Reitter +2007-12-23 Juri Linkov - * term/mac-win.el (mac-apple-event-map): Bind kHICommandAbout event to - `about-emacs' instead of `display-splash-screen'. + * term/mac-win.el (mac-apple-event-map): Bind About Emacs menu + item to about-emacs instead of display-splash-screen. 2007-12-22 Eli Zaretskii From f862fc9e051dfd9850b8b45fe9e41dd5f781ec5f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 23 Dec 2007 16:08:54 +0000 Subject: [PATCH 23/41] (switch-to-buffer-other-frame): Return the buffer switched to. --- lisp/ChangeLog | 5 +++++ lisp/files.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d9355aa928..e5742f97e50 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-23 Andreas Schwab + + * files.el (switch-to-buffer-other-frame): Return the buffer + switched to. + 2007-12-23 Juri Linkov * term/mac-win.el (mac-apple-event-map): Bind About Emacs menu diff --git a/lisp/files.el b/lisp/files.el index 423bc1eb804..d4b15324f94 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1010,14 +1010,16 @@ documentation for additional customization information." "Switch to buffer BUFFER in another frame. Optional second arg NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones. +This function returns the buffer it switched to. This uses the function `display-buffer' as a subroutine; see its documentation for additional customization information." (interactive "BSwitch to buffer in other frame: ") (let ((pop-up-frames t) same-window-buffer-names same-window-regexps) - (pop-to-buffer buffer t norecord) - (raise-frame (window-frame (selected-window))))) + (prog1 + (pop-to-buffer buffer t norecord) + (raise-frame (window-frame (selected-window)))))) (defun display-buffer-other-frame (buffer) "Switch to buffer BUFFER in another frame. From 72b7e664f44a0a9d96358c18d043c76772c32356 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 23 Dec 2007 16:45:07 +0000 Subject: [PATCH 24/41] (Type Keywords): Uncomment :validate and clarify it. Improve some of the commented-out keywords' text too. --- lispref/ChangeLog | 5 +++++ lispref/customize.texi | 48 ++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index a00eb3e65de..73af0a17ddb 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2007-12-23 Richard Stallman + + * customize.texi (Type Keywords): Uncomment :validate and clarify it. + Improve some of the commented-out keywords' text too. + 2007-12-04 Richard Stallman * objects.texi (Symbol Type): Fix typo. diff --git a/lispref/customize.texi b/lispref/customize.texi index fede33bd046..feb72387e4f 100644 --- a/lispref/customize.texi +++ b/lispref/customize.texi @@ -1113,6 +1113,16 @@ corresponding value, @var{function}, should be a function that accepts two arguments, a widget and a value; it should return non-@code{nil} if the value is acceptable. +@item :validate @var{function} +Specify a validation function for input. @var{function} takes a +widget as an argument, and should return @code{nil} if the widget's +current value is valid for the widget. Otherwise, it should return +the widget containing the invalid data, and set that widget's +@code{:error} property to a string explaining the error. + +In many cases you can use the function @code{widget-children-validate} +for this job; it tests that all children of @var{widget} are valid. + @ignore @item :indent @var{columns} Indent this item by @var{columns} columns. The indentation is used for @@ -1120,23 +1130,24 @@ Indent this item by @var{columns} columns. The indentation is used for buttons, and for editable lists. It affects the whole of the item except for the first line. -@item :offset @var{columns} -An integer indicating how many extra spaces to indent the subitems of -this item. By default, subitems are indented the same as their parent. +@item :offset @var{extra} +Indent the subitems of this item @var{extra} columns more than this +item itself. By default, subitems are indented the same as their +parent. -@item :extra-offset -An integer indicating how many extra spaces to add to this item's -indentation, compared to its parent. +@item :extra-offset @var{n} +Add @var{n} extra spaces to this item's indentation, compared to its +parent's indentation. -@item :notify -A function called each time the item or a subitem is changed. The -function is called with two or three arguments. The first argument is -the item itself, the second argument is the item that was changed, and -the third argument is the event leading to the change, if any. +@item :notify @var{function} +Call @var{function} each time the item or a subitem is changed. The +function gets two or three arguments. The first argument is the item +itself, the second argument is the item that was changed, and the +third argument is the event leading to the change, if any. -@item :menu-tag -A tag used in the menu when the widget is used as an option in a -@code{menu-choice} widget. +@item :menu-tag @var{tag-string} +Use @var{tag-string} in the menu when the widget is used as an option +in a @code{menu-choice} widget. @item :menu-tag-get A function used for finding the tag when the widget is used as an option @@ -1144,15 +1155,6 @@ in a @code{menu-choice} widget. By default, the tag used will be either the @code{:menu-tag} or @code{:tag} property if present, or the @code{princ} representation of the @code{:value} property if not. -@item :validate -A function which takes a widget as an argument, and return @code{nil} -if the widget's current value is valid for the widget. Otherwise, it -should return the widget containing the invalid data, and set that -widget's @code{:error} property to a string explaining the error. - -You can use the function @code{widget-children-validate} for this job; -it tests that all children of @var{widget} are valid. - @item :tab-order Specify the order in which widgets are traversed with @code{widget-forward} or @code{widget-backward}. This is only partially From 341a1bfb331089c1a78dfde7ed139918bb2880f0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 23 Dec 2007 18:09:10 +0000 Subject: [PATCH 25/41] (copy-face): Create the new face explicitly if it does not exist already. --- lisp/ChangeLog | 5 +++++ lisp/faces.el | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5742f97e50..f9fc2226269 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-23 Richard Stallman + + * faces.el (copy-face): Create the new face explicitly if it + does not exist already. + 2007-12-23 Andreas Schwab * files.el (switch-to-buffer-other-frame): Return the buffer diff --git a/lisp/faces.el b/lisp/faces.el index ceadb6f764f..a1b069e9ba6 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -158,13 +158,18 @@ and for each existing frame. If the optional fourth argument NEW-FRAME is given, copy the information from face OLD-FACE on frame FRAME -to NEW-FACE on frame NEW-FRAME." +to NEW-FACE on frame NEW-FRAME. In this case, FRAME may not be nil." (let ((inhibit-quit t)) (if (null frame) (progn + (when new-frame + (error "Copying face %s from all frames to one frame" + old-face)) + (make-empty-face new-face) (dolist (frame (frame-list)) (copy-face old-face new-face frame)) (copy-face old-face new-face t)) + (make-empty-face new-face) (internal-copy-lisp-face old-face new-face frame new-frame)) new-face)) From 86f795fdc8d8dc749820d970037b111cbcde5cb8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 23 Dec 2007 19:13:48 +0000 Subject: [PATCH 26/41] Load dired.el at run time too. --- lisp/ChangeLog | 2 ++ lisp/dired-aux.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9fc2226269..6214d715b37 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2007-12-23 Richard Stallman + * dired-aux.el: Load dired.el at run time too. + * faces.el (copy-face): Create the new face explicitly if it does not exist already. diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 8d0f184eb7c..e56b9e44a3a 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -37,7 +37,7 @@ ;;; Code: ;; We need macros in dired.el to compile properly. -(eval-when-compile (require 'dired)) +(require 'dired) (defvar dired-create-files-failures nil "Variable where `dired-create-files' records failing file names. From 5742be860f445f80c06c12846bd9ee0d44aadd30 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 24 Dec 2007 03:01:28 +0000 Subject: [PATCH 27/41] (phys_cursor_in_rect_p): Check if cursor is in fringe area. --- src/ChangeLog | 4 ++++ src/xdisp.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index fa3d8e78b05..2a8fc8e3f17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-12-24 YAMAMOTO Mitsuharu + + * xdisp.c (phys_cursor_in_rect_p): Check if cursor is in fringe area. + 2007-12-23 YAMAMOTO Mitsuharu * macmenu.c (fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5 diff --git a/src/xdisp.c b/src/xdisp.c index 13660f413e7..fa53a98556f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23481,6 +23481,24 @@ phys_cursor_in_rect_p (w, r) { XRectangle cr, result; struct glyph *cursor_glyph; + struct glyph_row *row; + + if (w->phys_cursor.vpos >= 0 + && w->phys_cursor.vpos < w->current_matrix->nrows + && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos), + row->enabled_p) + && row->cursor_in_fringe_p) + { + /* Cursor is in the fringe. */ + cr.x = window_box_right_offset (w, + (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) + ? RIGHT_MARGIN_AREA + : TEXT_AREA)); + cr.y = row->y; + cr.width = WINDOW_RIGHT_FRINGE_WIDTH (w); + cr.height = row->height; + return x_intersect_rectangles (&cr, r, &result); + } cursor_glyph = get_phys_cursor_glyph (w); if (cursor_glyph) From 9d826ef2087381a1241029671ca942718c3a19d9 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 24 Dec 2007 05:26:06 +0000 Subject: [PATCH 28/41] (make_process): Initialize pty_flag to Qnil instead of 0 as it is not a bit field on Emacs 22 yet. --- src/ChangeLog | 3 +++ src/process.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2a8fc8e3f17..c0b86a16593 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2007-12-24 YAMAMOTO Mitsuharu + * process.c (make_process): Initialize pty_flag to Qnil instead of 0 + as it is not a bit field on Emacs 22 yet. + * xdisp.c (phys_cursor_in_rect_p): Check if cursor is in fringe area. 2007-12-23 YAMAMOTO Mitsuharu diff --git a/src/process.c b/src/process.c index adf8af9670d..eb0dae04e96 100644 --- a/src/process.c +++ b/src/process.c @@ -626,7 +626,7 @@ make_process (name) XSETFASTINT (p->tick, 0); XSETFASTINT (p->update_tick, 0); p->pid = 0; - p->pty_flag = 0; + p->pty_flag = Qnil; p->raw_status_new = 0; p->status = Qrun; p->mark = Fmake_marker (); From 6143495cd6cb20700186b839bd5e5bd19a6519c8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 25 Dec 2007 16:56:28 +0000 Subject: [PATCH 29/41] (comint-mode-map): Explicitly bind `delete' and `kp-delete' so they never do EOF. --- lisp/ChangeLog | 5 +++++ lisp/comint.el | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6214d715b37..7ac2582e64c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-25 Richard Stallman + + * comint.el (comint-mode-map): Explicitly bind `delete' and `kp-delete' + so they never do EOF. + 2007-12-23 Richard Stallman * dired-aux.el: Load dired.el at run time too. diff --git a/lisp/comint.el b/lisp/comint.el index 047cc3b80fb..96c36f3496f 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -453,6 +453,10 @@ executed once when the buffer is created." (define-key map "\e\C-l" 'comint-show-output) (define-key map "\C-m" 'comint-send-input) (define-key map "\C-d" 'comint-delchar-or-maybe-eof) + ;; The following two are standardly aliased to C-d, + ;; but they should never do EOF, just delete. + (define-key map [delete] 'delete-char) + (define-key map [kp-delete] 'delete-char) (define-key map "\C-c " 'comint-accumulate) (define-key map "\C-c\C-x" 'comint-get-next-from-history) (define-key map "\C-c\C-a" 'comint-bol-or-process-mark) From 187e9721c77376f20efaf720ba0d925fb38e9c55 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 25 Dec 2007 20:00:12 +0000 Subject: [PATCH 30/41] (asm-mode-map): Add a major mode menu. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/asm-mode.el | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ac2582e64c..20eb447dcee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-12-25 Dan Nicolaescu + + * progmodes/asm-mode.el (asm-mode-map): Add a major mode menu. + 2007-12-25 Richard Stallman * comint.el (comint-mode-map): Explicitly bind `delete' and `kp-delete' diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index d38e6170a23..591adbd4392 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -79,6 +79,14 @@ (define-key map "\C-c;" 'comment-region) (define-key map "\C-j" 'newline-and-indent) (define-key map "\C-m" 'newline-and-indent) + (define-key map [menu-bar] (make-sparse-keymap)) + (define-key map [menu-bar asm-mode] (cons "Asm" map)) + (define-key map [asm-colon] + '("Insert Colon" . asm-colon)) + (define-key map [comment-region] + '("Comment Region" . comment-region)) + (define-key map [newline-and-indent] + '("Insert Newline and Indent" . newline-and-indent)) map) "Keymap for Asm mode.") From be775dfa5500cdf15086615d20d1a5fcb44eedaf Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 26 Dec 2007 05:02:04 +0000 Subject: [PATCH 31/41] *** empty log message *** --- admin/FOR-RELEASE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 4d99e8ae1cb..57b439b6749 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -59,6 +59,8 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html ** diff mode change for missing spaces in -u format. +** pot@gnu.org, 17 Dec: strange From line maker rmail-reply loop + * DOCUMENTATION ** Check the Emacs Tutorial. From a5af675edc7348b16262932edaf4385ef0d45479 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 26 Dec 2007 09:08:59 +0000 Subject: [PATCH 32/41] (fill-find-break-point): Fix doc-string typo. --- lisp/ChangeLog | 10 +++++++--- lisp/textmodes/fill.el | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20eb447dcee..f24d7c79182 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-12-26 Martin Rudalics + + * textmodes/fill.el (fill-find-break-point): Fix doc-string typo. + 2007-12-25 Dan Nicolaescu * progmodes/asm-mode.el (asm-mode-map): Add a major mode menu. @@ -27,9 +31,9 @@ 2007-12-22 Eli Zaretskii * simple.el (minibuffer-history, shell-command-history) - (set-variable-value-history): - * replace.el (regexp-history): - * international/mule-cmds.el (input-method-history): + (set-variable-value-history): + * replace.el (regexp-history): + * international/mule-cmds.el (input-method-history): * files.el (file-name-history): Add reference to history-length in the doc string. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 36167f599f4..42d7ea156c6 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -316,12 +316,12 @@ after an opening paren or just before a closing paren or a punctuation mark such as `?' or `:'. It is common in French writing to put a space at such places, which would normally allow breaking the line at those places." - (or (looking-at "[ \t]*[])},A;,b;(B?!;:-]") + (or (looking-at "[ \t]*[])},A;;(B?!;:-]") (save-excursion (skip-chars-backward " \t") (unless (bolp) (backward-char 1) - (or (looking-at "[([{,A+,b+(B]") + (or (looking-at "[([{,A++(B]") ;; Don't cut right after a single-letter word. (and (memq (preceding-char) '(?\t ?\s)) (eq (char-syntax (following-char)) ?w))))))) @@ -391,7 +391,7 @@ Don't move back past the buffer position LIMIT. This function is called when we are going to break the current line after or before a non-ASCII character. If the charset of the character has the property `fill-find-break-point-function', this -function calls the property value as a function with one arg LINEBEG. +function calls the property value as a function with one arg LIMIT. If the charset has no such property, do nothing." (let* ((ch (following-char)) (charset (char-charset ch)) From 73936494a34bc8c474eb7b315ad30ef653df5463 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 26 Dec 2007 17:29:34 +0000 Subject: [PATCH 33/41] (conf-mode-maybe): New function. (auto-mode-alist): Use conf-mode-maybe for .conf etc. --- lisp/ChangeLog | 5 +++++ lisp/files.el | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f24d7c79182..7eb76ce1539 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-26 Richard Stallman + + * files.el (conf-mode-maybe): New function. + (auto-mode-alist): Use conf-mode-maybe for .conf etc. + 2007-12-26 Martin Rudalics * textmodes/fill.el (fill-find-break-point): Fix doc-string typo. diff --git a/lisp/files.el b/lisp/files.el index d4b15324f94..ecfcc963e65 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2029,7 +2029,7 @@ since only a single case-insensitive search through the alist is made." ("java.+\\.conf\\'" . conf-javaprop-mode) ("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode) ;; *.cf, *.cfg, *.conf, *.config[.local|.de_DE.UTF8|...], */config - ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-mode) + ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-mode-maybe) ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode) ("\\`/etc/\\(?:acpid?/.+\\|aliases\\(?:\\.d/.+\\)?\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\|sysconfig/.+\\)\\'" . conf-mode) ;; ChangeLog.old etc. Other change-log-mode entries are above; @@ -2076,6 +2076,16 @@ See also `interpreter-mode-alist', which detects executable script modes based on the interpreters they specify to run, and `magic-mode-alist', which determines modes based on file contents.") +(defun conf-mode-maybe () + "Select Conf mode or XML mode according to start of file." + (if (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (looking-at "<\\?xml \\|