From cdd5307d74f1455ba1d681422fd6a6d53f90fd43 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 4 Feb 2008 09:42:16 +0000 Subject: Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-215 --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus.el | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'lisp') diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 355fa36e91a..cd3c128c05d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2008-02-03 Reiner Steib + + * gnus.el (gnus-group-startup-message): Add `find-image' call before + image-load-path is let-bound. Reported by Harald Hanche-Olsen + . + 2008-01-12 Reiner Steib * gnus-sum.el (gnus-article-sort-by-random) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index a4eb55c1135..fb16656f2eb 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1001,6 +1001,11 @@ be set in `.emacs' instead." ((and (fboundp 'find-image) (display-graphic-p) + ;; Make sure the library defining `image-load-path' is loaded + ;; (`find-image' is autoloaded) (and discard the result). Else, we may + ;; get "defvar ignored because image-load-path is let-bound" when calling + ;; `find-image' below. + (or (find-image '(nil (:type xpm :file "gnus.xpm"))) t) (let* ((data-directory (nnheader-find-etc-directory "images/gnus")) (image-load-path (cond (data-directory (list data-directory)) -- cgit v1.2.3 From d9090cc15a6ec3039fc0dc9ef4c826b8541d78f1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 4 Feb 2008 15:29:44 +0000 Subject: (cancel-change-group): Don't move point. --- lisp/ChangeLog | 45 +++++++++++++++++++++++---------------------- lisp/subr.el | 45 +++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 44 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20554f8442d..93b63a00f55 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,14 @@ +2008-02-04 Stefan Monnier + + * subr.el (cancel-change-group): Don't move point. + 2008-02-02 Michael Albinus Sync with Tramp 2.0.57. * net/tramp.el (tramp-handle-make-auto-save-file-name) - (tramp-completion-dissect-file-name, tramp-find-executable): Use - `mapc' instead of `mapcar'. + (tramp-completion-dissect-file-name, tramp-find-executable): + Use `mapc' instead of `mapcar'. (tramp-open-connection-setup-interactive-shell): Send only single prompt setting commands, in order to avoid double-prompt. @@ -112,8 +116,8 @@ 2008-01-26 Alan Mackenzie - * progmodes/cc-defs.el (c-save-buffer-state): Bind - buffer-file-name and buffer-file-truename to nil, to prevent + * progmodes/cc-defs.el (c-save-buffer-state): + Bind buffer-file-name and buffer-file-truename to nil, to prevent primitives generating "buffer is read only" messages. 2008-01-26 Eli Zaretskii @@ -179,9 +183,8 @@ 2008-01-16 Alan Mackenzie - * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside - an eval-and-compile, so as to permit byte-compiling (e.g. in - bootstrap). + * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside an + eval-and-compile, so as to permit byte-compiling (e.g. in bootstrap). 2008-01-16 Juanma Barranquero @@ -225,7 +228,7 @@ * progmodes/cc-vars.el (c-hanging-braces-alist): Remove the obscure non-working fragment ":value c-". - * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro + * progmodes/cc-engine.el (c-guess-basic-syntax): Prevent a macro call inside a struct being recognised as a K&R argument. 2008-01-14 Jason Rumney @@ -240,15 +243,14 @@ 2008-01-12 Eli Zaretskii - * view.el (view-file-other-window, view-file-other-frame): Don't - kill the buffer if it is modified. Doc fixes. + * view.el (view-file-other-window, view-file-other-frame): + Don't kill the buffer if it is modified. Doc fixes. (kill-buffer-if-not-modified): New function. (view-file): Don't kill the buffer if it is modified. - * progmodes/ebrowse.el (ebrowse-view-file-other-window): Delete - function. - (ebrowse-view/find-file-and-search-pattern): Call - view-file-other-window instead of ebrowse-view-file-other-window. + * progmodes/ebrowse.el (ebrowse-view-file-other-window): Delete. + (ebrowse-view/find-file-and-search-pattern): + Call view-file-other-window instead of ebrowse-view-file-other-window. (ebrowse-view-file-other-frame): Don't call current-window-configuration. Fix second argument in the call to view-mode-enter. Doc fix. @@ -263,8 +265,8 @@ 2008-01-10 Dan Nicolaescu - * files.el (safe-local-eval-forms): Mark - (add-hook 'write-file-hooks 'time-stamp) as safe. + * files.el (safe-local-eval-forms): + Mark (add-hook 'write-file-hooks 'time-stamp) as safe. 2008-01-10 Nick Roberts @@ -344,8 +346,8 @@ (verilog-auto-input-ignore-regexp) (verilog-auto-inout-ignore-regexp) (verilog-auto-output-ignore-regexp) - (verilog-auto-unused-ignore-regexp, verilog-typedef-regexp): Add - safe-local-variable properties. + (verilog-auto-unused-ignore-regexp, verilog-typedef-regexp): + Add safe-local-variable properties. (verilog-statement-menu, verilog-company) (verilog-re-search-forward, verilog-re-search-backward) (verilog-error-regexp-add, verilog-end-block-re) @@ -431,13 +433,12 @@ 2008-01-07 Nick Roberts - * progmodes/gdb-ui.el (gud-gdb-command-name): Explain - "--annotate=3" option is necessary for the Graphical Interface. + * progmodes/gdb-ui.el (gud-gdb-command-name): + Explain "--annotate=3" option is necessary for the Graphical Interface. 2008-01-07 Dan Nicolaescu - * vc-hg.el (vc-hg-dir-state): Pass the dir argument to - vc-hg-command. + * vc-hg.el (vc-hg-dir-state): Pass the dir argument to vc-hg-command. 2008-01-07 Glenn Morris diff --git a/lisp/subr.el b/lisp/subr.el index b4bd4a0150c..ef908c0a7cb 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1871,28 +1871,29 @@ This finishes the change group by accepting its changes as final." (defun cancel-change-group (handle) "Finish a change group made with `prepare-change-group' (which see). This finishes the change group by reverting all of its changes." - (dolist (elt handle) - (with-current-buffer (car elt) - (setq elt (cdr elt)) - (let ((old-car - (if (consp elt) (car elt))) - (old-cdr - (if (consp elt) (cdr elt)))) - ;; Temporarily truncate the undo log at ELT. - (when (consp elt) - (setcar elt nil) (setcdr elt nil)) - (unless (eq last-command 'undo) (undo-start)) - ;; Make sure there's no confusion. - (when (and (consp elt) (not (eq elt (last pending-undo-list)))) - (error "Undoing to some unrelated state")) - ;; Undo it all. - (while (listp pending-undo-list) (undo-more 1)) - ;; Reset the modified cons cell ELT to its original content. - (when (consp elt) - (setcar elt old-car) - (setcdr elt old-cdr)) - ;; Revert the undo info to what it was when we grabbed the state. - (setq buffer-undo-list elt))))) + (save-excursion + (dolist (elt handle) + (with-current-buffer (car elt) + (setq elt (cdr elt)) + (let ((old-car + (if (consp elt) (car elt))) + (old-cdr + (if (consp elt) (cdr elt)))) + ;; Temporarily truncate the undo log at ELT. + (when (consp elt) + (setcar elt nil) (setcdr elt nil)) + (unless (eq last-command 'undo) (undo-start)) + ;; Make sure there's no confusion. + (when (and (consp elt) (not (eq elt (last pending-undo-list)))) + (error "Undoing to some unrelated state")) + ;; Undo it all. + (while (listp pending-undo-list) (undo-more 1)) + ;; Reset the modified cons cell ELT to its original content. + (when (consp elt) + (setcar elt old-car) + (setcdr elt old-cdr)) + ;; Revert the undo info to what it was when we grabbed the state. + (setq buffer-undo-list elt)))))) ;;;; Display-related functions. -- cgit v1.2.3 From cb11476b222555583a5afe3f61d08fc8191d0ccc Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 4 Feb 2008 15:31:09 +0000 Subject: (cancel-change-group): Improve last fix. --- lisp/subr.el | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'lisp') diff --git a/lisp/subr.el b/lisp/subr.el index ef908c0a7cb..8420c8553dd 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1871,29 +1871,29 @@ This finishes the change group by accepting its changes as final." (defun cancel-change-group (handle) "Finish a change group made with `prepare-change-group' (which see). This finishes the change group by reverting all of its changes." - (save-excursion - (dolist (elt handle) - (with-current-buffer (car elt) - (setq elt (cdr elt)) - (let ((old-car - (if (consp elt) (car elt))) - (old-cdr - (if (consp elt) (cdr elt)))) - ;; Temporarily truncate the undo log at ELT. - (when (consp elt) - (setcar elt nil) (setcdr elt nil)) - (unless (eq last-command 'undo) (undo-start)) - ;; Make sure there's no confusion. - (when (and (consp elt) (not (eq elt (last pending-undo-list)))) - (error "Undoing to some unrelated state")) - ;; Undo it all. - (while (listp pending-undo-list) (undo-more 1)) - ;; Reset the modified cons cell ELT to its original content. - (when (consp elt) - (setcar elt old-car) - (setcdr elt old-cdr)) - ;; Revert the undo info to what it was when we grabbed the state. - (setq buffer-undo-list elt)))))) + (dolist (elt handle) + (with-current-buffer (car elt) + (setq elt (cdr elt)) + (let ((old-car + (if (consp elt) (car elt))) + (old-cdr + (if (consp elt) (cdr elt)))) + ;; Temporarily truncate the undo log at ELT. + (when (consp elt) + (setcar elt nil) (setcdr elt nil)) + (unless (eq last-command 'undo) (undo-start)) + ;; Make sure there's no confusion. + (when (and (consp elt) (not (eq elt (last pending-undo-list)))) + (error "Undoing to some unrelated state")) + ;; Undo it all. + (save-excursion + (while (listp pending-undo-list) (undo-more 1))) + ;; Reset the modified cons cell ELT to its original content. + (when (consp elt) + (setcar elt old-car) + (setcdr elt old-cdr)) + ;; Revert the undo info to what it was when we grabbed the state. + (setq buffer-undo-list elt))))) ;;;; Display-related functions. -- cgit v1.2.3 From 7e2a60001ef4611850e77105dac5ec443a023288 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 4 Feb 2008 16:36:48 +0000 Subject: * progmodes/verilog-mode.el (verilog-declaration-core-re): Add port directions by themselves, with no qualification, as base item of a declaration. (verilog-pretty-declarations): Add new flag that inhibits printing to the message buffer. (verilog-pretty-expr): Add new flag that inhibits printing to the message buffer. Improve handling of the many types of expression line up. (verilog-just-one-space): Don't print an empty message. (verilog-get-lineup-indent): Rework to support the better handling of expression lineup for verilog-pretty-expr. (verilog-auto-wire): Pass the quiet flag to verilog-pretty-expr. (verilog-mode-version, verilog-mode-release-date): Update. --- lisp/ChangeLog | 16 ++++ lisp/progmodes/verilog-mode.el | 179 ++++++++++++++++++++++------------------- 2 files changed, 112 insertions(+), 83 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 93b63a00f55..d7c4a120646 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2008-02-04 Michael McNamara + + * progmodes/verilog-mode.el (verilog-declaration-core-re): + Add port directions by themselves, with no qualification, as base + item of a declaration. + (verilog-pretty-declarations): Add new flag that inhibits printing + to the message buffer. + (verilog-pretty-expr): Add new flag that inhibits printing to the + message buffer. Improve handling of the many types of expression + line up. + (verilog-just-one-space): Don't print an empty message. + (verilog-get-lineup-indent): Rework to support the better handling + of expression lineup for verilog-pretty-expr. + (verilog-auto-wire): Pass the quiet flag to verilog-pretty-expr. + (verilog-mode-version, verilog-mode-release-date): Update. + 2008-02-04 Stefan Monnier * subr.el (cancel-change-group): Don't move point. diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index da91e36ca3d..5a9979e1495 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -115,9 +115,9 @@ ;;; Code: ;; This variable will always hold the version number of the mode -(defconst verilog-mode-version "383" +(defconst verilog-mode-version "389" "Version of this verilog mode.") -(defconst verilog-mode-release-date "2008-01-07-GNU" +(defconst verilog-mode-release-date "2008-02-01-GNU" "Release date of this verilog mode.") (defconst verilog-mode-release-emacs t "If non-nil, this version of verilog mode was released with Emacs itself.") @@ -1526,6 +1526,8 @@ find the errors." (eval-when-compile (verilog-regexp-words `( + ;; port direction (by themselves) + "inout" "input" "output" ;; integer_atom_type "byte" "shortint" "int" "longint" "integer" "time" ;; integer_vector_type @@ -4681,7 +4683,7 @@ ARG is ignored, for `comment-indent-function' compatibility." ;; -(defun verilog-pretty-declarations () +(defun verilog-pretty-declarations (&optional quiet) "Line up declarations around point." (interactive) (save-excursion @@ -4725,7 +4727,8 @@ ARG is ignored, for `comment-indent-function' compatibility." (current-column)))) (goto-char end) (goto-char start) - (if (> (- end start) 100) + (if (and (not quiet) + (> (- end start) 100)) (message "Lining up declarations..(please stand by)")) ;; Get the beginning of line indent first (while (progn (setq e (marker-position edpos)) @@ -4750,7 +4753,7 @@ ARG is ignored, for `comment-indent-function' compatibility." (setq r (- e (point))) (> r 0)) (setq e (point)) - (message "%d" r) + (unless quiet (message "%d" r)) (cond ((or (and verilog-indent-declaration-macros (looking-at verilog-declaration-re-1-macro)) @@ -4775,90 +4778,98 @@ ARG is ignored, for `comment-indent-function' compatibility." (verilog-forward-ws&directives) (forward-line -1))) (forward-line 1)) - (message ""))))) + (unless quiet (message "")))))) -(defun verilog-pretty-expr (&optional myre) +(defun verilog-pretty-expr (&optional quiet myre) "Line up expressions around point, or optional regexp MYRE." (interactive "sRegular Expression: ((<|:)?=) ") (save-excursion (if (or (eq myre nil) (string-equal myre "")) (setq myre "\\(<\\|:\\)?=")) -; (setq myre (concat "\\(^[^;" myre "]*\\)\\([" myre "]\\)")) - (setq myre (concat "\\(^[^;#:?=]*\\)\\([" myre "]\\)")) - (beginning-of-line) - (if (and (not (looking-at (concat "^\\s-*" verilog-complete-reg))) - (looking-at myre)) - (let* ((here (point)) - (e) (r) - (start - (progn - (beginning-of-line) - (setq e (point)) - (verilog-backward-syntactic-ws) - (beginning-of-line) - (while (and (not (looking-at (concat "^\\s-*" verilog-complete-reg))) - (looking-at myre) - (not (bobp))) + (setq myre (concat "\\(^[^;#:<=>]*\\)\\(" myre "\\)")) + (let ((rexp(concat "^\\s-*" verilog-complete-reg))) + (beginning-of-line) + (if (and (not (looking-at rexp )) + (looking-at myre)) + (let* ((here (point)) + (e) (r) + (start + (progn + (beginning-of-line) (setq e (point)) (verilog-backward-syntactic-ws) (beginning-of-line) - ) ;Ack, need to grok `define - e)) - (end - (progn - (goto-char here) - (end-of-line) - (setq e (point)) ;Might be on last line - (verilog-forward-syntactic-ws) - (beginning-of-line) - (while (and (not (looking-at - (concat "^\\s-*" verilog-complete-reg))) - (looking-at myre)) + (while (and (not (looking-at rexp )) + (looking-at myre) + (not (bobp)) + ) + (setq e (point)) + (verilog-backward-syntactic-ws) + (beginning-of-line) + ) ;Ack, need to grok `define + e)) + (end + (progn + (goto-char here) (end-of-line) - (setq e (point)) + (setq e (point)) ;Might be on last line (verilog-forward-syntactic-ws) - (beginning-of-line)) - e)) - (edpos (set-marker (make-marker) end)) - (ind)) - (goto-char start) - (verilog-do-indent (verilog-calculate-indent)) - (if (> (- end start) 100) - (message "Lining up expressions..(please stand by)")) - - ;; Set indent to minimum throughout region - (while (< (point) (marker-position edpos)) - (beginning-of-line) - (verilog-just-one-space myre) - (end-of-line) - (verilog-forward-syntactic-ws)) - - ;; Now find biggest prefix - (setq ind (verilog-get-lineup-indent-2 myre start edpos)) - - ;; Now indent each line. - (goto-char start) - (while (progn (setq e (marker-position edpos)) - (setq r (- e (point))) - (> r 0)) - (setq e (point)) - (message "%d" r) - (cond - ((looking-at myre) - (goto-char (match-end 1)) - (if (eq (char-after) ?=) - (indent-to (1+ ind)) ; line up the = of the <= with surrounding = - (indent-to ind))) - ((verilog-continued-line-1 start) - (goto-char e) - (indent-line-to ind)) - (t ; Must be comment or white space - (goto-char e) - (verilog-forward-ws&directives) - (forward-line -1))) - (forward-line 1)) - (message ""))))) + (beginning-of-line) + (while (and (not (looking-at rexp )) + (looking-at myre)) + (end-of-line) + (setq e (point)) + (verilog-forward-syntactic-ws) + (beginning-of-line) + ) + e)) + (edpos (set-marker (make-marker) end)) + (ind) + ) + (goto-char start) + (verilog-do-indent (verilog-calculate-indent)) + (if (and (not quiet) + (> (- end start) 100)) + (message "Lining up expressions..(please stand by)")) + + ;; Set indent to minimum throughout region + (while (< (point) (marker-position edpos)) + (beginning-of-line) + (verilog-just-one-space myre) + (end-of-line) + (verilog-forward-syntactic-ws) + ) + + ;; Now find biggest prefix + (setq ind (verilog-get-lineup-indent-2 myre start edpos)) + + ;; Now indent each line. + (goto-char start) + (while (progn (setq e (marker-position edpos)) + (setq r (- e (point))) + (> r 0)) + (setq e (point)) + (if (not quiet) (message "%d" r)) + (cond + ((looking-at myre) + (goto-char (match-end 1)) + (if (not (verilog-parenthesis-depth)) ;; ignore parenthsized exprs + (if (eq (char-after) ?=) + (indent-to (1+ ind)) ; line up the = of the <= with surrounding = + (indent-to ind) + ))) + ((verilog-continued-line-1 start) + (goto-char e) + (indent-line-to ind)) + (t ; Must be comment or white space + (goto-char e) + (verilog-forward-ws&directives) + (forward-line -1)) + ) + (forward-line 1)) + (unless quiet (message "")) + ))))) (defun verilog-just-one-space (myre) "Remove extra spaces around regular expression MYRE." @@ -4872,8 +4883,8 @@ ARG is ignored, for `comment-indent-function' compatibility." (if (looking-at "\\s-") (just-one-space)) (goto-char p1) (forward-char -1) - (if (looking-at "\\s-") (just-one-space))))) - (message "")) + (if (looking-at "\\s-") (just-one-space)) + )))) (defun verilog-indent-declaration (baseind) "Indent current lines as declaration. @@ -4974,13 +4985,15 @@ Region is defined by B and EDPOS." ;; Get rightmost position (while (progn (setq e (marker-position edpos)) (< (point) e)) - (if (verilog-re-search-forward myre e 'move) + (if (and (verilog-re-search-forward myre e 'move) + (not (verilog-parenthesis-depth))) ;; skip parenthsized exprs (progn - (goto-char (match-end 0)) + (goto-char (match-beginning 2)) (verilog-backward-syntactic-ws) (if (> (current-column) ind) (setq ind (current-column))) - (goto-char (match-end 0))))) + (goto-char (match-end 0))) + )) (if (> ind 0) (1+ ind) ;; No lineup-string found @@ -8498,7 +8511,7 @@ Typing \\[verilog-auto] will make this into: (when nil ;; Too slow on huge modules, plus makes everyone's module change (beginning-of-line) (setq pnt (point)) - (verilog-pretty-declarations) + (verilog-pretty-declarations quiet) (goto-char pnt) (verilog-pretty-expr "//")))))) -- cgit v1.2.3 From f4c4910c9e72b4e3f3cbfed42b0203cde1e8f22f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 4 Feb 2008 16:54:05 +0000 Subject: Comment changes. --- lisp/emacs-lisp/edebug.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index b988a8ac79d..e825f2434b4 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1496,7 +1496,7 @@ expressions; a `progn' form will be returned enclosing these forms." (cond ((symbolp head) (cond - ((null head) nil) ; () is legal. + ((null head) nil) ; () is valid. ((eq head 'interactive-p) ;; Special case: replace (interactive-p) with variable (setq edebug-def-interactive 'check-it) @@ -2076,7 +2076,7 @@ expressions; a `progn' form will be returned enclosing these forms." ;; doesn't handle (a . ,b). The straightforward fix: ;; (backquote-form . [&or nil backquote-form]) ;; uses up too much stack space. - ;; Note that `(foo . ,@bar) is not legal, so we don't need to handle it. + ;; Note that `(foo . ,@bar) is not valid, so we don't need to handle it. (backquote-form [&rest [¬ ","] backquote-form] . [&or nil backquote-form]) ;; If you use dotted forms in backquotes, replace the previous line -- cgit v1.2.3 From 4caf292da65c090bd7ad9b56a69fc5f5472a2088 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 4 Feb 2008 22:46:47 +0000 Subject: (w32-system-shells): Add TCC (new name for 4NT). --- lisp/ChangeLog | 4 ++++ lisp/w32-vars.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7c4a120646..66c29fe83f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-04 Juanma Barranquero + + * w32-vars.el (w32-system-shells): Add TCC (new name for 4NT). + 2008-02-04 Michael McNamara * progmodes/verilog-mode.el (verilog-declaration-core-re): diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 019962a898c..f660501a341 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -53,7 +53,7 @@ X does. See `w32-fixed-font-alist' for the font menu definition." (defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com" "4nt" "4nt.exe" "4dos" "4dos.exe" - "ndos" "ndos.exe") + "tcc" "tcc.exe" "ndos" "ndos.exe") "*List of strings recognized as Windows NT/9X system shells." :type '(repeat string) :group 'w32) -- cgit v1.2.3 From 9b9a412286efca8257d18175941b6370115445d6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 11:51:30 +0000 Subject: *** empty log message *** --- lisp/emacs-lisp/byte-run.el | 2 +- lisp/ffap.el | 2 +- lisp/follow.el | 2 +- lisp/isearch.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp') diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 48760d1e77e..ecf2ed57dac 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -227,7 +227,7 @@ In interpreted code, this is entirely equivalent to `progn'." ;; verbose t, nil byte-compile-verbose ;; optimize t, nil, source, byte byte-compile-optimize ;; warnings list of warnings byte-compile-warnings -;; Legal elements: (callargs redefine free-vars unresolved) +;; Valid elements: (callargs redefine free-vars unresolved) ;; file-format emacs18, emacs19 byte-compile-compatibility ;; ;; For example, this might appear at the top of a source file: diff --git a/lisp/ffap.el b/lisp/ffap.el index 3e62f2351c6..aaf92ebe306 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -426,7 +426,7 @@ Returned values: ;; (ffap-machine-p "mathcs" 5678 nil 'ping) ;; (ffap-machine-p "foo.bonk" nil nil 'ping) ;; (ffap-machine-p "foo.bonk.com" nil nil 'ping) - (if (or (string-match "[^-[:alnum:].]" host) ; Illegal chars (?) + (if (or (string-match "[^-[:alnum:].]" host) ; Invalid chars (?) (not (string-match "[^0-9]" host))) ; 1: a number? 2: quick reject nil (let* ((domain diff --git a/lisp/follow.el b/lisp/follow.el index ea5bf960dd9..e251d4c7b3c 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -300,7 +300,7 @@ ;; above for an example of how to bind the keys the way you like. ;; ;; Please note that the keymap is defined the first time this file is -;; loaded. Also note that the only legal way to manipulate the +;; loaded. Also note that the only valid way to manipulate the ;; keymap is to use `define-key'. Don't change it using `setq' or ;; similar! diff --git a/lisp/isearch.el b/lisp/isearch.el index e72df62d7f8..131bde71690 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1461,7 +1461,7 @@ to the barrier." ;; removes all bracket-sets and groups that might be in the way, as ;; well as partial \{\} constructs that the code below leaves behind. ;; Also skip over postfix operators -- though horrid, - ;; 'ab?\{5,6\}+\{1,2\}*' is perfectly legal. + ;; 'ab?\{5,6\}+\{1,2\}*' is perfectly valid. (while (and previous (or (isearch-error-state frame) (let* ((string (isearch-string-state frame)) -- cgit v1.2.3 From 0138efd4b32f2209944704e627e514274e1c1e20 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 12:07:11 +0000 Subject: *** empty log message *** --- lisp/emacs-lisp/cl-specs.el | 2 +- lisp/eshell/esh-var.el | 2 +- lisp/gnus/deuglify.el | 2 +- lisp/net/ange-ftp.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp') diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index d2d55204ef2..dc8ebef69d5 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -323,7 +323,7 @@ ;; Below is a complete spec for loop, in several parts that correspond ;; to the syntax given in CLtL2. The specs do more than specify where ;; the forms are; it also specifies, as much as Edebug allows, all the -;; syntactically legal loop clauses. The disadvantage of this +;; syntactically valid loop clauses. The disadvantage of this ;; completeness is rigidity, but the "for ... being" clause allows ;; arbitrary extensions of the form: [symbolp &rest &or symbolp form]. diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 15ecb119c5e..0e5f4484279 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -47,7 +47,7 @@ variable value, a subcommand, or even the result of a Lisp form." ;; ;; $ALSO-VAR ;; -;; "-" is a legal part of a variable name. +;; "-" is a valid part of a variable name. ;; ;; $-TOO ;; diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index c17be0a1479..75880c8f76b 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -68,7 +68,7 @@ ;; > verb. This sentence no verb. This sentence no verb. This ;; > sentence no verb. ;; -;; Unwrapping "You forgot in all your sentences." would be illegal as +;; Unwrapping "You forgot in all your sentences." would be invalid as ;; this part wasn't intended to be cited text. ;; `gnus-article-outlook-unwrap-lines' will only unwrap lines if the resulting ;; citation line will be of a certain maximum length. You can control diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 7428dcd380a..d53f740296a 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -297,7 +297,7 @@ ;; you would type: ;; C-x C-f /anonymous@ymir.claremont.edu:CSV/POLICY/RULES.MEM ;; -;; A legal VMS filename is of the form: FILE.TYPE;## +;; A valid VMS filename is of the form: FILE.TYPE;## ;; where FILE can be up to 39 characters ;; TYPE can be up to 39 characters ;; ## is a version number (an integer between 1 and 32,767) -- cgit v1.2.3 From 64ef5f3924eb1632829a20c9f69362bede6fc485 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 12:25:49 +0000 Subject: *** empty log message *** --- lisp/progmodes/scheme.el | 2 +- lisp/textmodes/ispell.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index c427eddf871..be4c23c781f 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -33,7 +33,7 @@ ;; for instance, at .] ;; All these Lisp-ish modes vary basically in details of the language ;; syntax they highlight/indent/index, but dsssl-mode uses "^;;;" as -;; the page-delimiter since ^L isn't normally a legal SGML character. +;; the page-delimiter since ^L isn't normally a valid SGML character. ;; ;; For interacting with a Scheme interpreter See also `run-scheme' in ;; the `cmuscheme' package and also the implementation-specific diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index ed6a6ed464b..edf2aab7955 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3757,7 +3757,7 @@ Both should not be used to define a buffer-local dictionary." ;; any character other than a space. Not rigorous enough. (while (re-search-forward " *\\([^ ]+\\)" end t) (setq string (match-string-no-properties 1)) - ;; This can fail when string contains a word with illegal chars. + ;; This can fail when string contains a word with invalid chars. ;; Error handling needs to be added between ispell and emacs. (if (and (< 1 (length string)) (equal 0 (string-match ispell-casechars string))) -- cgit v1.2.3 From dfa0b1fc0104b64b595f6cbbc4be892f47a2642f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 12:48:48 +0000 Subject: (erc-button-syntax-table): Replace `legal' with `valid'. --- lisp/erc/erc-button.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 426139cd80e..249715f2674 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -240,7 +240,7 @@ PAR is a number of a regexp grouping whose text will be passed to (modify-syntax-entry ?\\ "w" table) table) "Syntax table used when buttonizing messages. -This syntax table should make all the legal nick characters word +This syntax table should make all the valid nick characters word constituents.") (defvar erc-button-keys-added nil -- cgit v1.2.3 From 42c28f29df382c5453956e0e66c9dbc0370ba1b7 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 12:50:10 +0000 Subject: (erc-match-syntax-table): Replace `legal' with `valid'. --- lisp/erc/erc-match.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index c0efeef3d8f..97d421e50d8 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -256,7 +256,7 @@ current-nick, keyword, pal, dangerous-host, fool" (modify-syntax-entry ?\\ "w" table) table) "Syntax table used when highlighting messages. -This syntax table should make all the legal nick characters word +This syntax table should make all the valid nick characters word constituents.") ;; Faces: -- cgit v1.2.3 From 4f9c00e2dc1e780ba79554fa8620cf875e196d19 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 13:00:43 +0000 Subject: (erc-valid-nick-regexp): Replace `legal' with `valid'. --- lisp/erc/ChangeLog | 6 ++++++ lisp/erc/erc.el | 2 +- lisp/mail/mail-extr.el | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'lisp') diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index a631a4514a4..061bfc55444 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,9 @@ +2008-02-05 Juanma Barranquero + + * erc.el (erc-valid-nick-regexp): + * erc-button.el (erc-button-syntax-table): + * erc-match.el (erc-match-syntax-table): Replace `legal' with `valid'. + 2007-11-15 Juanma Barranquero * erc.el (erc-open): diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 00d61a60ffd..649fc4a63df 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2342,7 +2342,7 @@ If STRING is nil, the function does nothing." (setq list (cdr list)))))) (defvar erc-valid-nick-regexp "[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*" - "Regexp which matches all legal characters in a IRC nickname.") + "Regexp which matches all valid characters in a IRC nickname.") (defun erc-is-valid-nick-p (nick) "Check if NICK is a valid IRC nickname." diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index c43b0d5a2b0..dd44507ee57 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -850,7 +850,7 @@ consing a string.)" (setq char ?\() ; HAVE I NO SHAME?? ) ;; record the position of various interesting chars, determine - ;; legality later. + ;; validity later. ((setq record-pos-symbol (cdr (assq char '((?< . <-pos) (?> . >-pos) (?@ . @-pos) @@ -862,9 +862,9 @@ consing a string.)" ((eq char ?.) (forward-char 1)) ((memq char '( - ;; comment terminator illegal + ;; comment terminator invalid ?\) - ;; domain literal terminator illegal + ;; domain literal terminator invalid ?\] ;; \ allowed only within quoted strings, ;; domain literals, and comments -- cgit v1.2.3 From cb5bf6ba22c51521d497d601806e4afd9e948902 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 14:24:26 +0000 Subject: *** empty log message *** --- lisp/mh-e/mh-e.el | 4 ++-- lisp/mh-e/mh-xface.el | 4 ++-- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cc-styles.el | 4 ++-- lisp/progmodes/cperl-mode.el | 24 ++++++++++++------------ 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'lisp') diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 5186b1b2791..67dd6d2d68a 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1986,7 +1986,7 @@ you would use \"(mh-set-cmd-note 4)\"." :package-version '(MH-E . "7.0")) (defun mh-scan-format-file-check (symbol value) - "Check if desired setting is legal. + "Check if desired setting is valid. Throw an error if user tries to set `mh-scan-format-file' to anything but t when `mh-adaptive-cmd-note-flag' is on. Otherwise, set SYMBOL to VALUE." @@ -2025,7 +2025,7 @@ Emacs start with 0)." :package-version '(MH-E . "6.0")) (defun mh-adaptive-cmd-note-flag-check (symbol value) - "Check if desired setting is legal. + "Check if desired setting is valid. Throw an error if user tries to turn on `mh-adaptive-cmd-note-flag' when `mh-scan-format-file' isn't t. Otherwise, set SYMBOL to VALUE." diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index 6b0dc863c1f..e160c6e5875 100644 --- a/lisp/mh-e/mh-xface.el +++ b/lisp/mh-e/mh-xface.el @@ -360,8 +360,8 @@ This is only done if `mh-x-image-cache-directory' is nil." "Canonicalize URL. Replace the ?/ character with a ?! character and append .png. Also replaces special characters with `mh-url-hexify-string' -since not all characters, such as :, are legal within Windows -filenames. In addition, replaces * with %2a. See URL +since not all characters, such as :, are valid within Windows +filenames. In addition, replaces * with %2a. See URL `http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'." (format "%s/%s.png" mh-x-image-cache-directory (mh-replace-regexp-in-string diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index b361585422a..de15d959cbd 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -213,7 +213,7 @@ "\\([{}@` \t]\\|\\+\\+\\|--\\|\\\\.\\)") ;; A "neutral" char(pair). Doesn't change the "state" of a subsequent /. ;; This is space/tab, braces, an auto-increment/decrement operator or an -;; escaped character. Or one of the (illegal) characters @ or `. But NOT an +;; escaped character. Or one of the (invalid) characters @ or `. But NOT an ;; end of line (even if escaped). (defconst c-awk-neutrals*-re (concat "\\(" c-awk-neutral-re "\\)*")) diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index d7be903d357..b509fdd7cc2 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -721,7 +721,7 @@ be after it." ((bobp) (setq pos (point-min))) ((not pos) (let ((distance (skip-chars-backward "^{"))) - ;; unbalanced parenthesis, while illegal C code, + ;; unbalanced parenthesis, while invalid C code, ;; shouldn't cause an infloop! See unbal.c (when (zerop distance) ;; Punt! diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 02240400b1e..72bc86b6cc1 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -423,7 +423,7 @@ STYLE using `c-set-style' if the optional SET-P flag is non-nil." (defun c-read-offset (langelem) ;; read new offset value for LANGELEM from minibuffer. return a - ;; legal value only + ;; valid value only (let* ((oldoff (cdr-safe (or (assq langelem c-offsets-alist) (assq langelem (get 'c-offsets-alist 'c-stylevar-fallback))))) @@ -555,7 +555,7 @@ variables." "[ \t\f]*\\\\?$") (setq c-sentence-end-with-esc-eol (concat "\\(\\(" (c-default-value-sentence-end) "\\)" - ;; N.B.: "$" would be illegal when not enclosed like "\\($\\)". + ;; N.B.: "$" would be invalid when not enclosed like "\\($\\)". "\\|" "[.?!][]\"')}]* ?\\\\\\($\\)[ \t\n]*" "\\)"))) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index bb45f74dea1..f2fbc1207fc 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1250,7 +1250,7 @@ versions of Emacs." ["Contract groups" cperl-contract-levels cperl-use-syntax-table-text-property] "----" - ["Find next interpolated" cperl-next-interpolated-REx + ["Find next interpolated" cperl-next-interpolated-REx (next-single-property-change (point-min) 'REx-interpolated)] ["Find next interpolated (no //o)" cperl-next-interpolated-REx-0 @@ -2845,7 +2845,7 @@ Will not look before LIM." (skip-chars-backward " \t") (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))) (get-text-property (point) 'first-format-line))) - + ;; Look at previous line that's at column 0 ;; to determine whether we are in top-level decls ;; or function's arg decls. Set basic-indent accordingly. @@ -3079,7 +3079,7 @@ and closing parentheses and brackets." ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block] (+ (save-excursion ; To beg-of-defun, or end of last sexp (goto-char (elt i 1)) ; start = Good place to start parsing - (- (current-indentation) ; + (- (current-indentation) ; (if (elt i 4) cperl-indent-level 0))) ; immed-after-block (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after ;; Look at previous line that's at column 0 @@ -3899,7 +3899,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', ;;; XXX What to do: foo < octal (up to total 3 dig) ;; \DIGIT -> backref unless \0 - ;; \DIGITs -> backref if legal + ;; \DIGITs -> backref if valid ;; otherwise up to 3 -> octal ;; Do not try to distinguish, we guess ((or (and (memq qtag (append "01234567" nil)) @@ -4460,7 +4460,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', "\\=[01234567]?[01234567]?" (1- e) 'to-end)) (and (memq qtag (append "89" nil)) - (re-search-forward + (re-search-forward "\\=[0123456789]*" (1- e) 'to-end)) (and (eq qtag ?x) (re-search-forward @@ -4498,7 +4498,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', ;; in m]]: m][\\\]\]] produces [\\]] ;;; POSIX? [:word:] [:^word:] only inside [] ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") - (while + (while (and argument (re-search-forward (if (eq (char-after b) ?\] ) @@ -5815,7 +5815,7 @@ indentation and initial hashes. Behaves usually outside of comment." "," cperl-maybe-white-and-comment-rex "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") - ;; Bug in font-lock: limit is used not only to limit + ;; Bug in font-lock: limit is used not only to limit ;; searches, but to set the "extend window for ;; facification" property. Thus we need to minimize. ,(if cperl-font-lock-multiline @@ -6784,7 +6784,7 @@ construct. DONE-TO and STATEPOS indicate changes to internal caches maintained by CPerl." (interactive "P") (or arg - (setq arg (if (eq cperl-syntaxify-by-font-lock + (setq arg (if (eq cperl-syntaxify-by-font-lock (if backtrace 'backtrace 'message)) 0 1))) (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t)) (setq cperl-syntaxify-by-font-lock arg) @@ -8245,7 +8245,7 @@ We suppose that the regexp is scanned already." (defun cperl-invert-if-unless-modifiers () "Change `B if A;' into `if (A) {B}' etc if possible. \(Unfinished.)" - (interactive) ; + (interactive) ; (let (A B pre-B post-B pre-if post-if pre-A post-A if-string (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")) (and (= (char-syntax (preceding-char)) ?w) -- cgit v1.2.3 From 23dcd8ca146002df47575b2f52e1ea7c7dcfb18e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Feb 2008 14:46:11 +0000 Subject: *** empty log message *** --- lisp/mh-e/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lisp') diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 83afab4e507..d538ddc94ef 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,9 @@ +2008-02-05 Juanma Barranquero + + * mh-e.el (mh-scan-format-file-check, mh-adaptive-cmd-note-flag-check): + * mh-xface.el (mh-x-image-url-cache-canonicalize): + Replace `legal' with `valid'. + 2007-08-08 Glenn Morris * mh-folder.el, mh-letter.el, mh-show.el: Replace `iff' in -- cgit v1.2.3 From 64137f20978c133c6f74d9aea65b240edc76be3a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 6 Feb 2008 17:48:42 +0000 Subject: (mh-do-in-gnu-emacs, mh-do-in-xemacs) (with-mh-folder-updating, mh-in-show-buffer) (mh-iterate-on-messages-in-region, mh-iterate-on-range): (mh-do-at-event-location, mh-seq-msgs): Add debug decls. --- lisp/mh-e/mh-acros.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index 21fe19bb885..bfc5fa283de 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -65,12 +65,14 @@ loads \"cl\" appropriately." ;;;###mh-autoload (defmacro mh-do-in-gnu-emacs (&rest body) "Execute BODY if in GNU Emacs." + (declare (debug t)) (unless (featurep 'xemacs) `(progn ,@body))) (put 'mh-do-in-gnu-emacs 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-do-in-xemacs (&rest body) "Execute BODY if in XEmacs." + (declare (debug t)) (when (featurep 'xemacs) `(progn ,@body))) (put 'mh-do-in-xemacs 'lisp-indent-hook 'defun) @@ -178,6 +180,7 @@ Execute BODY, which can modify the folder buffer without having to worry about file locking or the read-only flag, and return its result. If SAVE-MODIFICATION-FLAG is non-nil, the buffer's modification flag is unchanged, otherwise it is cleared." + (declare (debug t)) (setq save-modification-flag (car save-modification-flag)) ; CL style `(prog1 (let ((mh-folder-updating-mod-flag (buffer-modified-p)) @@ -196,6 +199,7 @@ is unchanged, otherwise it is cleared." "Format is (mh-in-show-buffer (SHOW-BUFFER) &body BODY). Display buffer SHOW-BUFFER in other window and execute BODY in it. Stronger than `save-excursion', weaker than `save-window-excursion'." + (declare (debug t)) (setq show-buffer (car show-buffer)) ; CL style `(let ((mh-in-show-buffer-saved-window (selected-window))) (switch-to-buffer-other-window ,show-buffer) @@ -212,6 +216,7 @@ Stronger than `save-excursion', weaker than `save-window-excursion'." After BODY has been executed return to original window. The modification flag of the buffer in the event window is preserved." + (declare (debug t)) (let ((event-window (make-symbol "event-window")) (event-position (make-symbol "event-position")) (original-window (make-symbol "original-window")) @@ -245,9 +250,9 @@ preserved." ;;; Sequences and Ranges ;;;###mh-autoload -(defmacro mh-seq-msgs (sequence) +(defsubst mh-seq-msgs (sequence) "Extract messages from the given SEQUENCE." - (list 'cdr sequence)) + (cdr sequence)) ;;;###mh-autoload (defmacro mh-iterate-on-messages-in-region (var begin end &rest body) @@ -257,6 +262,7 @@ VAR is bound to the message on the current line as we loop starting from BEGIN till END. In each step BODY is executed. If VAR is nil then the loop is executed without any binding." + (declare (debug (symbolp body))) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var)) @@ -282,6 +288,7 @@ a string. In each iteration, BODY is executed. The parameter RANGE is usually created with `mh-interactive-range' in order to provide a uniform interface to MH-E functions." + (declare (debug (symbolp body))) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var) -- cgit v1.2.3 From 27c335693403393b7c38be96e85bf6629972ed2b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 6 Feb 2008 17:49:56 +0000 Subject: (mh-make-seq, mh-seq-name): Use defsubst. --- lisp/mh-e/ChangeLog | 10 ++++++++++ lisp/mh-e/mh-seq.el | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'lisp') diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index d538ddc94ef..79e44c96256 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,13 @@ +2008-02-06 Richard Stallman + + * mh-seq.el (mh-make-seq, mh-seq-name): Use defsubst. + + * mh-acros.el (mh-do-in-gnu-emacs, mh-do-in-xemacs) + (with-mh-folder-updating, mh-in-show-buffer) + (mh-iterate-on-messages-in-region, mh-iterate-on-range): + (mh-do-at-event-location): Add debug decls. + (mh-seq-msgs): Use defsubst. + 2008-02-05 Juanma Barranquero * mh-e.el (mh-scan-format-file-check, mh-adaptive-cmd-note-flag-check): diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el index 87c59cd8136..fd64d8a6902 100644 --- a/lisp/mh-e/mh-seq.el +++ b/lisp/mh-e/mh-seq.el @@ -53,13 +53,13 @@ ;;; Macros -(defmacro mh-make-seq (name msgs) +(defsubst mh-make-seq (name msgs) "Create sequence NAME with the given MSGS." - (list 'cons name msgs)) + (cons name msgs)) -(defmacro mh-seq-name (sequence) +(defsubst mh-seq-name (sequence) "Extract sequence name from the given SEQUENCE." - (list 'car sequence)) + (car sequence)) -- cgit v1.2.3 From 1e281896cfa95242a33b483085383a1d9660da4c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 8 Feb 2008 05:00:46 +0000 Subject: (custom-theme-set-variables): Sort symbols that are dependencies before symbols that depend on them. (custom-enabled-themes): Set after custom-theme-directory. --- lisp/ChangeLog | 6 ++++++ lisp/custom.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66c29fe83f3..243018e12b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-02-08 Glenn Morris + + * custom.el (custom-theme-set-variables): Sort symbols that are + dependencies before symbols that depend on them. + (custom-enabled-themes): Set after custom-theme-directory. + 2008-02-04 Juanma Barranquero * w32-vars.el (w32-system-shells): Add TCC (new name for 4NT). diff --git a/lisp/custom.el b/lisp/custom.el index 64c0d2e6a6f..1a045483491 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -885,7 +885,7 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')." (memq (get symbol 'custom-autoload) '(nil noset))) ;; This symbol needs to be autoloaded, even just for a `set'. (custom-load-symbol symbol)))) - + ;; Move minor modes and variables with explicit requires to the end. (setq args (sort args @@ -898,6 +898,8 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')." (error "Circular custom dependency between `%s' and `%s'" sym1 sym2)) (2-then-1 nil) + ;; 1 is a dependency of 2, so needs to be set first. + (1-then-2) ;; Put minor modes and symbols with :require last. ;; Putting minor modes last ensures that the mode ;; function will see other customized values rather @@ -1092,6 +1094,7 @@ This does not include the `user' theme, which is set by Customize, and always takes precedence over other Custom Themes." :group 'customize :type '(repeat symbol) + :set-after '(custom-theme-directory) ; so we can find the themes :set (lambda (symbol themes) ;; Avoid an infinite loop when custom-enabled-themes is ;; defined in a theme (e.g. `user'). Enabling the theme sets -- cgit v1.2.3 From 46f6fa95d18dfc951e1c55fee1c727d68f006861 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 8 Feb 2008 18:22:54 +0000 Subject: (ifconfig): Renamed from ipconfig. (ipconfig): Alas to ifconfig. (ifconfig-program): Renamed from ipconfig-program. (ifconfig-program-options): Renamed from ipconfig-program-options. --- lisp/ChangeLog | 7 +++++++ lisp/net/net-utils.el | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 243018e12b8..2732fb56bb5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-02-08 Richard Stallman + + * net/net-utils.el (ifconfig): Renamed from ipconfig. + (ipconfig): Alas to ifconfig. + (ifconfig-program): Renamed from ipconfig-program. + (ifconfig-program-options): Renamed from ipconfig-program-options. + 2008-02-08 Glenn Morris * custom.el (custom-theme-set-variables): Sort symbols that are diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index fcfb8524b09..bc235b71f94 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -93,7 +93,7 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type '(repeat string)) -(defcustom ipconfig-program +(defcustom ifconfig-program (if (eq system-type 'windows-nt) "ipconfig" "ifconfig") @@ -101,11 +101,11 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type 'string) -(defcustom ipconfig-program-options +(defcustom ifconfig-program-options (list (if (eq system-type 'windows-nt) "/all" "-a")) - "Options for ipconfig-program." + "Options for `ifconfig-program'." :group 'net-utils :type '(repeat string)) @@ -352,18 +352,18 @@ If your system's ping continues until interrupted, you can try setting options))) ;;;###autoload -(defun ipconfig () - "Run ipconfig program." +(defun ifconfig () + "Run ifconfig program." (interactive) (net-utils-run-program - "Ipconfig" - (concat "** Ipconfig ** " ipconfig-program " ** ") - ipconfig-program - ipconfig-program-options)) + "Ifconfig" + (concat "** Ifconfig ** " ifconfig-program " ** ") + ifconfig-program + ifconfig-program-options)) -;; This is the normal name on most Unixes. +;; Windows uses this name. ;;;###autoload -(defalias 'ifconfig 'ipconfig) +(defalias 'ipconfig 'ifconfig) ;;;###autoload (defun netstat () -- cgit v1.2.3 From 9f889daf9f5fd63bf3a2bcc5ee98b7382961222c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 8 Feb 2008 20:09:16 +0000 Subject: (selection-coding-system): Remove, since it's now defined in select.el rather than in xselect.c. --- lisp/cus-start.el | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lisp') diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 8c95f9af65f..80b51793738 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -129,7 +129,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of :match (lambda (widget value) (and value (not (functionp value))))) (function :value ignore)))) - (selection-coding-system mule coding-system "22.1") ;; dired.c (completion-ignored-extensions dired (repeat (string :format "%v"))) @@ -456,10 +455,6 @@ since it could result in memory overflow and make Emacs crash." (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable) (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start 'custom-variable) -(put 'selection-coding-system 'custom-set - (lambda (symbol value) - (set-selection-coding-system value) - (set symbol value))) ;; Record cus-start as loaded ;; if we have set up all the info that we can set up. -- cgit v1.2.3 From b55a97a5a3e70be9296bcc7c0e7e6b6100989ebb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 8 Feb 2008 20:11:33 +0000 Subject: Revert previous change, which should have been on the trunk. --- lisp/cus-start.el | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lisp') diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 80b51793738..8c95f9af65f 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -129,6 +129,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of :match (lambda (widget value) (and value (not (functionp value))))) (function :value ignore)))) + (selection-coding-system mule coding-system "22.1") ;; dired.c (completion-ignored-extensions dired (repeat (string :format "%v"))) @@ -455,6 +456,10 @@ since it could result in memory overflow and make Emacs crash." (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable) (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start 'custom-variable) +(put 'selection-coding-system 'custom-set + (lambda (symbol value) + (set-selection-coding-system value) + (set symbol value))) ;; Record cus-start as loaded ;; if we have set up all the info that we can set up. -- cgit v1.2.3 From d884d6adc76215fc61b3609b6bf2e7c0546ee430 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Feb 2008 01:32:38 +0000 Subject: (ipconfig-program, ipconfig-program-options): Add obsolete aliases to the old names. --- lisp/ChangeLog | 9 +++++++-- lisp/net/net-utils.el | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2732fb56bb5..08d7ad44e08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,14 @@ +2008-02-09 Glenn Morris + + * net/net-utils.el (ipconfig-program, ipconfig-program-options): + Add obsolete aliases to the old names. + 2008-02-08 Richard Stallman - * net/net-utils.el (ifconfig): Renamed from ipconfig. + * net/net-utils.el (ifconfig): Rename from ipconfig. (ipconfig): Alas to ifconfig. (ifconfig-program): Renamed from ipconfig-program. - (ifconfig-program-options): Renamed from ipconfig-program-options. + (ifconfig-program-options): Rename from ipconfig-program-options. 2008-02-08 Glenn Morris diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index bc235b71f94..0bed6cc9bcd 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -101,6 +101,8 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type 'string) +(define-obsolete-variable-alias 'ipconfig-program 'ifconfig-program "22.2") + (defcustom ifconfig-program-options (list (if (eq system-type 'windows-nt) @@ -109,6 +111,9 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type '(repeat string)) +(define-obsolete-variable-alias 'ipconfig-program-options + 'ifconfig-program-options "22.2") + (defcustom netstat-program "netstat" "Program to print network statistics." :group 'net-utils -- cgit v1.2.3 From 714536d63bcae069b63c5d18821e1a1ca8808690 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Feb 2008 01:33:54 +0000 Subject: Fix tense. --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08d7ad44e08..46247265ab6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,7 +7,7 @@ * net/net-utils.el (ifconfig): Rename from ipconfig. (ipconfig): Alas to ifconfig. - (ifconfig-program): Renamed from ipconfig-program. + (ifconfig-program): Rename from ipconfig-program. (ifconfig-program-options): Rename from ipconfig-program-options. 2008-02-08 Glenn Morris -- cgit v1.2.3 From e07277ffa0d2b64d5a13120deb202d222ade9dc2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Feb 2008 01:37:45 +0000 Subject: Fix typo. --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 46247265ab6..9e44d6a7e2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,7 +6,7 @@ 2008-02-08 Richard Stallman * net/net-utils.el (ifconfig): Rename from ipconfig. - (ipconfig): Alas to ifconfig. + (ipconfig): Alias to ifconfig. (ifconfig-program): Rename from ipconfig-program. (ifconfig-program-options): Rename from ipconfig-program-options. -- cgit v1.2.3 From d0048c60f239ad126d061b5ddbf5145cf309e25d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 9 Feb 2008 14:22:49 +0000 Subject: (compilation-next-error): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/compile.el | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9e44d6a7e2b..27a2e5979ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-09 Eli Zaretskii + + * progmodes/compile.el (compilation-next-error): Doc fix. + 2008-02-09 Glenn Morris * net/net-utils.el (ipconfig-program, ipconfig-program-options): diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 1fd0074dd41..bd7302a5a7e 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1544,9 +1544,13 @@ Just inserts the text, but uses `insert-before-markers'." (defun compilation-next-error (n &optional different-file pt) "Move point to the next error in the compilation buffer. +This function does NOT find the source line like \\[next-error]. Prefix arg N says how many error messages to move forwards (or backwards, if negative). -Does NOT find the source line like \\[next-error]." +Optional arg DIFFERENT-FILE, if non-nil, means find next error for a +file that is different from the current one. +Optional arg PT, if non-nil, specifies the value of point to start +looking for the next message." (interactive "p") (or (compilation-buffer-p (current-buffer)) (error "Not in a compilation buffer")) -- cgit v1.2.3 From 5099d51223aceae0a2c50531a0b26eb23e8c9e26 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 9 Feb 2008 14:34:45 +0000 Subject: (compilation-find-file): Doc fix. --- lisp/ChangeLog | 1 + lisp/progmodes/compile.el | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 27a2e5979ff..c1cd83312bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2008-02-09 Eli Zaretskii * progmodes/compile.el (compilation-next-error): Doc fix. + (compilation-find-file): Doc fix. 2008-02-09 Glenn Morris diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index bd7302a5a7e..7f87dbcd6b1 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1848,13 +1848,17 @@ and overlay is highlighted between MK and END-MK." (defun compilation-find-file (marker filename directory &rest formats) "Find a buffer for file FILENAME. +If FILENAME is not found at all, ask the user where to find it. +Pop up the buffer containing MARKER and scroll to MARKER if we ask +the user where to find the file. Search the directories in `compilation-search-path'. A nil in `compilation-search-path' means to try the \"current\" directory, which is passed in DIRECTORY. If DIRECTORY is relative, it is combined with `default-directory'. If DIRECTORY is nil, that means use `default-directory'. -If FILENAME is not found at all, ask the user where to find it. -Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." +FORMATS, if given, is a list of formats to reformat FILENAME when +looking for it: for each element FMT in FORMATS, this function +attempts to find a file whose name is produced by (format FMT FILENAME)." (or formats (setq formats '("%s"))) (let ((dirs compilation-search-path) (spec-dir (if directory -- cgit v1.2.3 From 73dd622fb4648ce267acbaa15e1b57d64ddedb9f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 10 Feb 2008 14:04:01 +0000 Subject: (rcirc-url-regexp): Replace definition by copying from gnus-button-url-regexp. --- lisp/ChangeLog | 5 +++++ lisp/net/rcirc.el | 35 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1cd83312bc..9bc3a32df6f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-10 ,AF(Bvar Arnfj,Av(Br,Ap(B Bjarmason (tiny change) + + * net/rcirc.el (rcirc-url-regexp): Replace definition by copying + from gnus-button-url-regexp. + 2008-02-09 Eli Zaretskii * progmodes/compile.el (compilation-next-error): Doc fix. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 5bc775b8957..d885b059240 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1887,23 +1887,24 @@ keywords when no KEYWORD is given." string)) (defvar rcirc-url-regexp - (rx-to-string - `(and word-boundary - (or (and - (or (and (or "http" "https" "ftp" "file" "gopher" "news" - "telnet" "wais" "mailto") - "://") - "www.") - (1+ (char "-a-zA-Z0-9_.")) - (1+ (char "-a-zA-Z0-9_")) - (optional ":" (1+ (char "0-9")))) - (and (1+ (char "-a-zA-Z0-9_.")) - (or ".com" ".net" ".org") - word-boundary)) - (optional - (and "/" - (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]()")) - (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]()"))))) + (concat + "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|" + "nntp\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)" + "\\(//[-a-z0-9_.]+:[0-9]*\\)?" + (if (string-match "[[:digit:]]" "1") ;; Support POSIX? + (let ((chars "-a-z0-9_=#$@~%&*+\\/[:word:]") + (punct "!?:;.,")) + (concat + "\\(?:" + ;; Match paired parentheses, e.g. in Wikipedia URLs: + "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)" "[" chars "]" + "\\|" + "[" chars punct "]+" "[" chars "]" + "\\)")) + (concat ;; XEmacs 21.4 doesn't support POSIX. + "\\([-a-z0-9_=!?#$@~%&*+\\/:;.,]\\|\\w\\)+" + "\\([-a-z0-9_=#$@~%&*+\\/]\\|\\w\\)")) + "\\)") "Regexp matching URLs. Set to nil to disable URL features in rcirc.") (defun rcirc-browse-url (&optional arg) -- cgit v1.2.3 From f060b622fb5bbae92d4d44f7d9d290070efff016 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 10 Feb 2008 16:36:07 +0000 Subject: (diff-beginning-of-file-and-junk): If we're on the Index: line, don't search backward for the previous one. --- lisp/ChangeLog | 5 +++++ lisp/diff-mode.el | 1 + 2 files changed, 6 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9bc3a32df6f..900489317a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-10 Stefan Monnier + + * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the + Index: line, don't search backward for the previous one. + 2008-02-10 ,AF(Bvar Arnfj,Av(Br,Ap(B Bjarmason (tiny change) * net/rcirc.el (rcirc-url-regexp): Replace definition by copying diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 4c566b344a9..6794fab11f8 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -489,6 +489,7 @@ data such as \"Index: ...\" and such." (diff-file-next) (setq file (point))) (let ((index (save-excursion + (forward-line 1) ;In case we're looking at "Index:". (re-search-backward "^Index: " prevhunk t)))) (when index (setq file index)) (if (<= file start) -- cgit v1.2.3 From c91db6f12d39ea9b4abeffcebf185b1779562187 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 12 Feb 2008 14:32:56 +0000 Subject: (uniquify-buffer-base-name): New function. Suggested by Stefan Monnier . --- lisp/uniquify.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 02f598ae9fc..b2167f48656 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -189,6 +189,13 @@ It actually holds the list of `uniquify-item's corresponding to the conflict.") (make-variable-buffer-local 'uniquify-managed) (put 'uniquify-managed 'permanent-local t) +;; Used in desktop.el to save the non-uniquified buffer name +(defun uniquify-buffer-base-name () + "Return the base name of the current buffer. +Return nil if the buffer is not managed by uniquify." + (and uniquify-managed + (uniquify-item-base (car uniquify-managed)))) + ;;; Main entry point. (defun uniquify-rationalize-file-buffer-names (base dirname newbuf) @@ -489,7 +496,7 @@ For use on `kill-buffer-hook'." (dolist (buf buffers) (set-buffer (car buf)) (rename-buffer (cdr buf) t)))) - ;; continue standard uploading + ;; continue standard unloading nil) (provide 'uniquify) -- cgit v1.2.3 From 9787268671ebbdea9f731468af84406390cd40c3 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 12 Feb 2008 14:36:34 +0000 Subject: (uniquify-managed): Don't defvar. (desktop-buffer-info): Use `uniquify-buffer-base-name', not `uniquify-managed'. Return also the buffer's base name. (desktop-save): When saving the buffer info, filter out the base name, and save it as buffer name if the buffer is managed by uniquify. --- lisp/ChangeLog | 11 +++++++++++ lisp/desktop.el | 37 +++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 900489317a7..5b368112454 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2008-02-12 Juanma Barranquero + + * uniquify.el (uniquify-buffer-base-name): New function. + Suggested by Stefan Monnier . + + * desktop.el (uniquify-managed): Don't defvar. + (desktop-buffer-info): Use `uniquify-buffer-base-name', not + `uniquify-managed'. Return also the buffer's base name. + (desktop-save): When saving the buffer info, filter out the base name, + and save it as buffer name if the buffer is managed by uniquify. + 2008-02-10 Stefan Monnier * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the diff --git a/lisp/desktop.el b/lisp/desktop.el index 2d6f1178079..61db03e8c86 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -135,8 +135,6 @@ ;;; Code: -(defvar uniquify-managed) - (defvar desktop-file-version "206" "Version number of desktop file format. Written into the desktop file and used at desktop read to provide @@ -653,11 +651,11 @@ is nil, ask the user where to save the desktop." (defun desktop-buffer-info (buffer) (set-buffer buffer) (list + ;; base name of the buffer; replaces the buffer name if managed by uniquify + (and (fboundp 'uniquify-buffer-base-name) (uniquify-buffer-base-name)) ;; basic information (desktop-file-name (buffer-file-name) desktop-dirname) - (if (bound-and-true-p uniquify-managed) - (uniquify-item-base (car uniquify-managed)) - (buffer-name)) + (buffer-name) major-mode ;; minor modes (let (ret) @@ -886,19 +884,22 @@ See also `desktop-base-file-name'." (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n") (dolist (l (mapcar 'desktop-buffer-info (buffer-list))) - (when (apply 'desktop-save-buffer-p l) - (insert "(" - (if (or (not (integerp eager)) - (if (zerop eager) - nil - (setq eager (1- eager)))) - "desktop-create-buffer" - "desktop-append-buffer-args") - " " - desktop-file-version) - (dolist (e l) - (insert "\n " (desktop-value-to-string e))) - (insert ")\n\n"))) + (let ((base (pop l))) + (when (apply 'desktop-save-buffer-p l) + (insert "(" + (if (or (not (integerp eager)) + (if (zerop eager) + nil + (setq eager (1- eager)))) + "desktop-create-buffer" + "desktop-append-buffer-args") + " " + desktop-file-version) + ;; If the base name is non-nil, we save it instead of the buffer name + (when base (setcar (nthcdr 1 l) base)) + (dolist (e l) + (insert "\n " (desktop-value-to-string e))) + (insert ")\n\n")))) (setq default-directory desktop-dirname) (let ((coding-system-for-write 'emacs-mule)) -- cgit v1.2.3 From 558ca3c1225f6035442733d5d3fb5fd4c40a0a45 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Feb 2008 16:49:21 +0000 Subject: (font-lock-set-defaults): Unset previously set variables when needed. --- lisp/ChangeLog | 5 +++++ lisp/font-lock.el | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b368112454..49706f3c0aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Stefan Monnier + + * font-lock.el (font-lock-set-defaults): Unset previously set variables + when needed. + 2008-02-12 Juanma Barranquero * uniquify.el (uniquify-buffer-base-name): New function. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 8fcd85515a4..0408d12b5d1 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1777,13 +1777,16 @@ Sets various variables using `font-lock-defaults' (or, if nil, using (cdr-safe (assq major-mode font-lock-removed-keywords-alist)))) (set (make-local-variable 'font-lock-defaults) defaults) ;; Syntactic fontification? - (when (nth 1 defaults) - (set (make-local-variable 'font-lock-keywords-only) t)) + (if (nth 1 defaults) + (set (make-local-variable 'font-lock-keywords-only) t) + (kill-local-variable 'font-lock-keywords-only)) ;; Case fold during regexp fontification? - (when (nth 2 defaults) - (set (make-local-variable 'font-lock-keywords-case-fold-search) t)) + (if (nth 2 defaults) + (set (make-local-variable 'font-lock-keywords-case-fold-search) t) + (kill-local-variable 'font-lock-keywords-case-fold-search)) ;; Syntax table for regexp and syntactic fontification? - (when (nth 3 defaults) + (if (null (nth 3 defaults)) + (kill-local-variable 'font-lock-syntax-table) (set (make-local-variable 'font-lock-syntax-table) (copy-syntax-table (syntax-table))) (dolist (selem (nth 3 defaults)) @@ -1794,9 +1797,10 @@ Sets various variables using `font-lock-defaults' (or, if nil, using (mapcar 'identity (car selem)))) (modify-syntax-entry char syntax font-lock-syntax-table))))) ;; Syntax function for syntactic fontification? - (when (nth 4 defaults) + (if (nth 4 defaults) (set (make-local-variable 'font-lock-beginning-of-syntax-function) - (nth 4 defaults))) + (nth 4 defaults)) + (kill-local-variable 'font-lock-beginning-of-syntax-function)) ;; Variable alist? (dolist (x (nthcdr 5 defaults)) (set (make-local-variable (car x)) (cdr x))) -- cgit v1.2.3 From 5df71560b0f9c577cd23a56d2a726d50932a5c2a Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 12 Feb 2008 23:29:19 +0000 Subject: (fancy-startup-screen, normal-splash-screen): Set default-directory to command-line-default-directory. --- lisp/startup.el | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lisp') diff --git a/lisp/startup.el b/lisp/startup.el index 39a63630fae..1b325db45e7 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1456,6 +1456,7 @@ splash screen in another window." (with-current-buffer splash-buffer (let ((inhibit-read-only t)) (erase-buffer) + (setq default-directory command-line-default-directory) (make-local-variable 'startup-screen-inhibit-startup-screen) (if pure-space-overflow (insert pure-space-overflow-message)) @@ -1554,6 +1555,7 @@ after Emacs starts. If STARTUP is nil, display the About screen." (with-current-buffer (get-buffer-create "*About GNU Emacs*") (setq buffer-read-only nil) (erase-buffer) + (setq default-directory command-line-default-directory) (set (make-local-variable 'tab-width) 8) (if (not startup) (set (make-local-variable 'mode-line-format) -- cgit v1.2.3 From 4c9702c3e88137e8e0b51964b4ab5f8de5ff0814 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 12 Feb 2008 23:30:33 +0000 Subject: (after-init-hook): Set inhibit-startup-screen to t after reading the desktop. --- lisp/ChangeLog | 8 ++++++++ lisp/desktop.el | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49706f3c0aa..dc940e64ab9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2008-02-12 Juri Linkov + + * startup.el (fancy-startup-screen, normal-splash-screen): + Set default-directory to command-line-default-directory. + + * desktop.el (after-init-hook): Set inhibit-startup-screen to t + after reading the desktop. + 2008-02-12 Stefan Monnier * font-lock.el (font-lock-set-defaults): Unset previously set variables diff --git a/lisp/desktop.el b/lisp/desktop.el index 61db03e8c86..8be86571f13 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1289,7 +1289,9 @@ If there are no buffers left to create, kill the timer." (when (member key command-line-args) (setq command-line-args (delete key command-line-args)) (setq desktop-save-mode nil))) - (when desktop-save-mode (desktop-read)))) + (when desktop-save-mode + (desktop-read) + (setq inhibit-startup-screen t)))) (provide 'desktop) -- cgit v1.2.3 From de95cc30ec71235a682f16b7356569620fe947b9 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 13 Feb 2008 17:20:11 +0000 Subject: * net/ange-ftp.el (ange-ftp-cf1): Quote FILENAME. --- lisp/ChangeLog | 4 ++++ lisp/net/ange-ftp.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc940e64ab9..87141d02ed2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-13 Michael Albinus + + * net/ange-ftp.el (ange-ftp-cf1): Quote FILENAME. + 2008-02-12 Juri Linkov * startup.el (fancy-startup-screen, normal-splash-screen): diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index d53f740296a..d4816dbe1c8 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3766,7 +3766,7 @@ Value is (0 0) if the modification time cannot be determined." (ange-ftp-send-cmd t-host t-user - (list 'put (or temp2 filename) t-name) + (list 'put (or temp2 (ange-ftp-quote-string filename)) t-name) (or msg (if (and temp2 f-parsed) (format "Putting %s" newname) -- cgit v1.2.3 From 2e8195083823ba5ba044343389bd39adc9f48072 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 13 Feb 2008 21:50:37 +0000 Subject: (highlight-save-buffer-state): New macro. (highlight-save-buffer-state, hilit-chg-set-face-on-change) (hilit-chg-clear): Use it to preserve the modified-p flag. (highlight-changes-rotate-faces): Don't mess with the undo-list. --- lisp/ChangeLog | 7 ++++ lisp/hilit-chg.el | 95 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 62 insertions(+), 40 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87141d02ed2..9233db66710 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-02-13 Stefan Monnier + + * hilit-chg.el (highlight-save-buffer-state): New macro. + (highlight-save-buffer-state, hilit-chg-set-face-on-change) + (hilit-chg-clear): Use it to preserve the modified-p flag. + (highlight-changes-rotate-faces): Don't mess with the undo-list. + 2008-02-13 Michael Albinus * net/ange-ftp.el (ange-ftp-cf1): Quote FILENAME. diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index f75c694175d..73d6c4b91d8 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -515,12 +515,28 @@ the text properties of type `hilit-chg'." (delete-overlay ov)))))) (hilit-chg-display-changes beg end))) +;; Inspired by font-lock. Something like this should be moved to subr.el. +(defmacro highlight-save-buffer-state (&rest body) + "Bind variables according to VARLIST and eval BODY restoring buffer state." + (declare (indent 0) (debug t)) + (let ((modified (make-symbol "modified"))) + `(let* ((,modified (buffer-modified-p)) + (inhibit-modification-hooks t) + deactivate-mark + ;; So we don't check the file's mtime. + buffer-file-name + buffer-file-truename) + (progn + ,@body) + (unless ,modified + (restore-buffer-modified-p nil))))) + ;;;###autoload (defun highlight-changes-remove-highlight (beg end) "Remove the change face from the region between BEG and END. This allows you to manually remove highlighting from uninteresting changes." (interactive "r") - (let ((after-change-functions nil)) + (highlight-save-buffer-state (remove-text-properties beg end '(hilit-chg nil)) (hilit-chg-fixup beg end))) @@ -543,38 +559,39 @@ This allows you to manually remove highlighting from uninteresting changes." (if undo-in-progress (if (eq highlight-changes-mode 'active) (hilit-chg-fixup beg end)) - (if (and (= beg end) (> leng-before 0)) - ;; deletion - (progn - ;; The eolp and bolp tests are a kludge! But they prevent - ;; rather nasty looking displays when deleting text at the end - ;; of line, such as normal corrections as one is typing and - ;; immediately makes a correction, and when deleting first - ;; character of a line. -;;; (if (= leng-before 1) -;;; (if (eolp) -;;; (setq beg-decr 0 end-incr 0) -;;; (if (bolp) -;;; (setq beg-decr 0)))) -;;; (setq beg (max (- beg beg-decr) (point-min))) - (setq end (min (+ end end-incr) (point-max))) - (setq type 'hilit-chg-delete)) - ;; Not a deletion. - ;; Most of the time the following is not necessary, but - ;; if the current text was marked as a deletion then - ;; the old overlay is still in effect, so if we add some - ;; text then remove the deletion marking, but set it to + (highlight-save-buffer-state + (if (and (= beg end) (> leng-before 0)) + ;; deletion + (progn + ;; The eolp and bolp tests are a kludge! But they prevent + ;; rather nasty looking displays when deleting text at the end + ;; of line, such as normal corrections as one is typing and + ;; immediately makes a correction, and when deleting first + ;; character of a line. + ;; (if (= leng-before 1) + ;; (if (eolp) + ;; (setq beg-decr 0 end-incr 0) + ;; (if (bolp) + ;; (setq beg-decr 0)))) + ;; (setq beg (max (- beg beg-decr) (point-min))) + (setq end (min (+ end end-incr) (point-max))) + (setq type 'hilit-chg-delete)) + ;; Not a deletion. + ;; Most of the time the following is not necessary, but + ;; if the current text was marked as a deletion then + ;; the old overlay is still in effect, so if we add some + ;; text then remove the deletion marking, but set it to ;; changed otherwise its highlighting disappears. (if (eq (get-text-property end 'hilit-chg) 'hilit-chg-delete) (progn (remove-text-properties end (+ end 1) '(hilit-chg nil)) (put-text-property end (+ end 1) 'hilit-chg 'hilit-chg) (if (eq highlight-changes-mode 'active) - (hilit-chg-fixup beg (+ end 1)))))) - (unless no-property-change - (put-text-property beg end 'hilit-chg type)) - (if (or (eq highlight-changes-mode 'active) no-property-change) - (hilit-chg-make-ov type beg end)))))) + (hilit-chg-fixup beg (+ end 1)))))) + (unless no-property-change + (put-text-property beg end 'hilit-chg type)) + (if (or (eq highlight-changes-mode 'active) no-property-change) + (hilit-chg-make-ov type beg end))))))) (defun hilit-chg-set (value) "Turn on Highlight Changes mode for this buffer." @@ -602,12 +619,11 @@ This removes all saved change information." (message "Cannot remove highlighting from read-only mode buffer %s" (buffer-name)) (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t) - (let ((after-change-functions nil)) + (highlight-save-buffer-state (hilit-chg-hide-changes) (hilit-chg-map-changes - '(lambda (prop start stop) - (remove-text-properties start stop '(hilit-chg nil)))) - ) + (lambda (prop start stop) + (remove-text-properties start stop '(hilit-chg nil))))) (setq highlight-changes-mode nil) (force-mode-line-update) ;; If we type: C-u -1 M-x highlight-changes-mode @@ -798,11 +814,12 @@ this, eval the following in the buffer to be saved: ;; of the current buffer due to the rotation. We do this by inserting (in ;; `buffer-undo-list') entries restoring buffer-modified-p to nil before ;; and after the entry for the rotation. - (unless modified - ;; Install the "before" entry. - (setq buffer-undo-list - (cons '(apply restore-buffer-modified-p nil) - buffer-undo-list))) + ;; FIXME: this is no good: we need to test the `modified' state at the + ;; time of the undo, not at the time of the "do", otherwise the undo + ;; may erroneously clear the modified flag. --Stef + ;; (unless modified + ;; ;; Install the "before" entry. + ;; (push '(apply restore-buffer-modified-p nil) buffer-undo-list)) (unwind-protect (progn ;; ensure hilit-chg-list is made and up to date @@ -815,10 +832,8 @@ this, eval the following in the buffer to be saved: (if (eq highlight-changes-mode 'active) (hilit-chg-display-changes))) (unless modified - ;; Install the "after" entry. - (setq buffer-undo-list - (cons '(apply restore-buffer-modified-p nil) - buffer-undo-list)) + ;; Install the "after" entry. FIXME: See above. + ;; (push '(apply restore-buffer-modified-p nil) buffer-undo-list) (restore-buffer-modified-p nil))))) ;; This always returns nil so it is safe to use in write-file-functions -- cgit v1.2.3 From c273429337771fd0318b4f45cbd21eed4bf48e4d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 14 Feb 2008 02:42:45 +0000 Subject: (sgml-mode): Fix comment syntax. --- lisp/ChangeLog | 4 ++++ lisp/textmodes/sgml-mode.el | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9233db66710..a92d8d16c73 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-14 Stefan Monnier + + * textmodes/sgml-mode.el (sgml-mode): Fix comment syntax. + 2008-02-13 Stefan Monnier * hilit-chg.el (highlight-save-buffer-state): New macro. diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index ed7bd87237a..37531306aa6 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -469,8 +469,12 @@ Do \\[describe-key] on the following bindings to discover what they do. sgml-transformation-function)) ;; This will allow existing comments within declarations to be ;; recognized. - (set (make-local-variable 'comment-start-skip) "\\(?:\\)?") + ;; I can't find a clear description of SGML/XML comments, but it seems that + ;; the only reliable ones are although it's not clear what + ;; "..." can contain. It used to accept -- ... -- as well, but that was + ;; apparently a mistake. + (set (make-local-variable 'comment-start-skip) "