From d5f8ae01473f2e6a4a84b1ebf7f20ec8c58ca27d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 11 Nov 2007 03:17:27 +0000 Subject: [PATCH 01/65] *** empty log message *** --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/ChangeLog b/man/ChangeLog index b3151b56e05..5dc97b83329 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2007-11-11 Glenn Morris + + * calendar.texi (Special Diary Entries): Fix Thanksgiving example. + 2007-11-04 Reiner Steib * gnus.texi, gnus-faq.texi, message.texi: Bump version to 5.10.9. From b409ff248a897530ab79e03ef73e7160826e2022 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 11 Nov 2007 03:17:40 +0000 Subject: [PATCH 02/65] (Special Diary Entries): Fix Thanksgiving example. --- man/calendar.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/man/calendar.texi b/man/calendar.texi index c111eac354f..e330d6f2f48 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -1397,19 +1397,19 @@ nonmarking (with @samp{&}) when possible. specifies a regularly occurring event by offsets specified in days, weeks, and months. It is comparable to a crontab entry interpreted by the @code{cron} utility. Here is a nonmarking, floating diary entry -that applies to the last Thursday in November: +that applies to the fourth Thursday in November: @findex diary-float @example -&%%(diary-float 11 4 -1) American Thanksgiving +&%%(diary-float 11 4 4) American Thanksgiving @end example @noindent The 11 specifies November (the eleventh month), the 4 specifies Thursday (the fourth day of the week, where Sunday is numbered zero), and the -@minus{}1 specifies ``last'' (1 would mean ``first,'' 2 would mean -``second,'' @minus{}2 would mean ``second-to-last,'' and so on). The -month can be a single month or a list of months. Thus you could change +second 4 specifies the fourth Thursday (1 would mean ``first,'' 2 would +mean ``second,'' @minus{}2 would mean ``second-to-last,'' and so on). +The month can be a single month or a list of months. Thus you could change the 11 above to @samp{'(1 2 3)} and have the entry apply to the last Thursday of January, February, and March. If the month is @code{t}, the entry applies to all months of the year.@refill From 87f74ea51fe6fa95c0713f37fd35baaf03e3d1a8 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 11 Nov 2007 20:22:18 +0000 Subject: [PATCH 03/65] *** empty log message *** --- lisp/ChangeLog | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57e6d1dd9c3..24311720dd1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,60 @@ 2007-11-10 Juri Linkov * startup.el: Backport startup screen related changes from the trunk. + (initialization): Change group to `environment'. + (inhibit-startup-screen): Rename from `inhibit-splash-screen'. + (inhibit-splash-screen): Make alias to `inhibit-startup-screen'. + (inhibit-startup-message): Change alias to `inhibit-startup-screen'. + (initial-scratch-message): Fix docstring. + (startup-screen-inhibit-startup-screen) + (pure-space-overflow-message): New variables. + (command-line): Rename `inhibit-startup-message' to + `inhibit-startup-screen'. + (initial-scratch-message): Doc fix. + (fancy-splash-text): Remove variable. + (fancy-startup-text, fancy-about-text, splash-screen-keymap): + New variables. + (fancy-splash-delay, fancy-splash-max-time) + (fancy-current-text, fancy-splash-stop-time) + (fancy-splash-outer-buffer, fancy-splash-last-input-event): + Remove variables. + (fancy-splash-insert): Use help-echo from the 3rd element of the + link specification list, or "Follow this link" if it's nil. Doc fix. + Allow functions for face and link specs. + (fancy-splash-tail): Remove function. + (fancy-startup-tail): New function. + (fancy-splash-default-action, fancy-splash-special-event-action) + (fancy-splash-screens): Remove functions. + (fancy-about-screen): New function. + (normal-splash-screen): Rename argument `hide-on-input' to `startup'. + Fix docstring. Use argument `startup' to conditionally display + different texts for Startup and About screens. Don't display Help + commands on the About screen. Remove `unwind-protect' `sit-for' + delay and `kill-buffer' after it. + (normal-mouse-startup-screen, normal-splash-screen) + (normal-no-mouse-startup-screen): New functions. + (startup-echo-area-message): Change text of the echo area. + (display-splash-screen): Remove function. + (display-startup-screen, display-about-screen): New functions. + (about-emacs): Make alias to `display-about-screen'. + (display-splash-screen): Make alias to `display-startup-screen'. + (command-line-1): Rename `inhibit-startup-message' to + `inhibit-startup-screen'. Inhibit startup screen when Emacs is + started with command line options "-f", "-funcall", "-e", "-eval", + "-execute", "-insert", "-find-file", "-file", "-visit". + Inhibit startup screen when Emacs is started with a file name only + on tty (i.e. don't inhibit it when started with a file name like + "emacs FILE..." on a window system). + Comment out unused code for coping with the old sit-for behavior. + If file-count > 0, then display the concise version in another + window, otherwise display full version in the same window. * loadup.el: Add `button'. Move up `startup'. * help.el (help-map, help-for-help-internal): Add `C-h C-a'. * version.el (emacs-copyright): Add emacs-copyright. + * menu-bar.el (menu-bar-help-menu): + Move "About Emacs" and "About GNU" to the end of the Help menu. + Move "Emacs Psychotherapist" after "Send Bug Report...". + Move "External Packages" after "Find Emacs Packages". 2007-11-10 Jason Rumney From 079fa3cb265e8ace1934981b744b3127e89bcce6 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 11 Nov 2007 20:23:23 +0000 Subject: [PATCH 04/65] Rename save-buffers-kill-terminal to save-buffers-kill-emacs to fix previous commit. --- lisp/startup.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index 4d0af4fe27e..ad09ff2e834 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1671,7 +1671,7 @@ To quit a partially entered command, type Control-g.\n") ;; use precomputed string to save lots of time. (if (and (eq (key-binding "\C-h") 'help-command) (eq (key-binding "\C-xu") 'advertised-undo) - (eq (key-binding "\C-x\C-c") 'save-buffers-kill-terminal) + (eq (key-binding "\C-x\C-c") 'save-buffers-kill-emacs) (eq (key-binding "\C-ht") 'help-with-tutorial) (eq (key-binding "\C-hi") 'info) (eq (key-binding "\C-hr") 'info-emacs-manual) @@ -1726,7 +1726,7 @@ Get help\t %s 'action (lambda (button) (view-order-manuals)) 'follow-link t) (insert (substitute-command-keys - "\t \\[view-order-manuals]\tExit Emacs\t \\[save-buffers-kill-terminal]"))) + "\t \\[view-order-manuals]\tExit Emacs\t \\[save-buffers-kill-emacs]"))) ;; Say how to use the menu bar with the keyboard. (insert "\n") From a064691f5899cfb127cfb4819581bf41dae548ca Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 11 Nov 2007 20:23:41 +0000 Subject: [PATCH 05/65] (menu-bar-help-menu): Move "About Emacs" and "About GNU" to the end of the Help menu. Move "Emacs Psychotherapist" after "Send Bug Report...". Move "External Packages" after "Find Emacs Packages". --- lisp/menu-bar.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index a44165ff633..525ed0dd7af 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1340,9 +1340,12 @@ key, a click, or a menu-item")) '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro :help "Read the Introduction to Emacs Lisp Programming")) -(define-key menu-bar-help-menu [emacs-psychotherapist] - '(menu-item "Emacs Psychotherapist" doctor - :help "Our doctor will help you feel better")) +(define-key menu-bar-help-menu [about-gnu-project] + '(menu-item "About GNU" describe-project + :help "About the GNU System, GNU Project, and GNU/Linux")) +(define-key menu-bar-help-menu [about-emacs] + '(menu-item "About Emacs" about-emacs + :help "Display version number, copyright info, and basic help")) (define-key menu-bar-help-menu [sep4] '("--")) (define-key menu-bar-help-menu [describe-no-warranty] @@ -1351,15 +1354,9 @@ key, a click, or a menu-item")) (define-key menu-bar-help-menu [describe-copying] '(menu-item "Copying Conditions" describe-copying :help "Show the Emacs license (GPL)")) -(define-key menu-bar-help-menu [about-gnu-project] - '(menu-item "About GNU" describe-project - :help "About the GNU System, GNU Project, and GNU/Linux")) (define-key menu-bar-help-menu [getting-new-versions] '(menu-item "Getting New Versions" describe-distribution :help "How to get latest versions of Emacs")) -(define-key menu-bar-help-menu [external-packages] - '(menu-item "External Packages" menu-bar-help-extra-packages - :help "Lisp packages distributed separately for use in Emacs")) (defun menu-bar-help-extra-packages () "Display help about some additional packages available for Emacs." (interactive) @@ -1367,11 +1364,11 @@ key, a click, or a menu-item")) (view-file (expand-file-name "MORE.STUFF" data-directory)) (goto-address))) -(define-key menu-bar-help-menu [about-emacs] - '(menu-item "About Emacs" display-splash-screen - :help "Display version number, copyright info, and basic help")) (define-key menu-bar-help-menu [sep2] '("--")) +(define-key menu-bar-help-menu [external-packages] + '(menu-item "External Packages" menu-bar-help-extra-packages + :help "Lisp packages distributed separately for use in Emacs")) (define-key menu-bar-help-menu [find-emacs-packages] '(menu-item "Find Emacs Packages" finder-by-keyword :help "Find packages and features by keyword")) @@ -1386,6 +1383,9 @@ key, a click, or a menu-item")) (list 'menu-item "Search Documentation" menu-bar-search-documentation-menu)) (define-key menu-bar-help-menu [sep1] '("--")) +(define-key menu-bar-help-menu [emacs-psychotherapist] + '(menu-item "Emacs Psychotherapist" doctor + :help "Our doctor will help you feel better")) (define-key menu-bar-help-menu [send-emacs-bug-report] '(menu-item "Send Bug Report..." report-emacs-bug :help "Send e-mail to Emacs maintainers")) From 3618423c39c5d0379c743b6cd66a2703ac9af8df Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 11 Nov 2007 22:33:07 +0000 Subject: [PATCH 06/65] (iso-translate-conventions): Doc fix. (iso-aggressive-german-trans-tab, iso-conservative-german-trans-tab, iso-tex2iso-trans-tab, iso-gtex2iso-trans-tab): Reflow docstring. (iso-spanish, iso-german, iso-iso2tex, iso-tex2iso, iso-gtex2iso, iso-iso2gtex, iso-iso2duden, iso-iso2sgml, iso-sgml2iso): Rewrite in active voice. --- lisp/ChangeLog | 9 +++++++ lisp/international/iso-cvt.el | 50 +++++++++++++++++------------------ 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24311720dd1..1b5f99b55b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2007-11-11 Juanma Barranquero + + * international/iso-cvt.el (iso-translate-conventions): Doc fix. + (iso-aggressive-german-trans-tab, iso-conservative-german-trans-tab) + (iso-tex2iso-trans-tab, iso-gtex2iso-trans-tab): Reflow docstring. + (iso-spanish, iso-german, iso-iso2tex, iso-tex2iso, iso-gtex2iso) + (iso-iso2gtex, iso-iso2duden, iso-iso2sgml, iso-sgml2iso): + Rewrite in active voice. + 2007-11-10 Juri Linkov * startup.el: Backport startup screen related changes from the trunk. diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el index d7149b8a9bc..f2725e9d854 100644 --- a/lisp/international/iso-cvt.el +++ b/lisp/international/iso-cvt.el @@ -65,7 +65,7 @@ "Spanish translation table.") (defun iso-translate-conventions (from to trans-tab) - "Use the translation table TRANS-TAB to translate the current buffer." + "Translate between FROM and TO using the translation table TRANS-TAB." (save-excursion (save-restriction (narrow-to-region from to) @@ -84,8 +84,8 @@ ;;;###autoload (defun iso-spanish (from to &optional buffer) "Translate net conventions for Spanish to ISO 8859-1. -The region between FROM and TO is translated using -the table `iso-spanish-trans-tab'. +Translate the region between FROM and TO using the table +`iso-spanish-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-spanish-trans-tab)) @@ -102,8 +102,8 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ("\\\\3" "ß") ) "German translation table. -This table uses an aggressive translation approach and may erroneously -translate too much.") +This table uses an aggressive translation approach +and may erroneously translate too much.") (defvar iso-conservative-german-trans-tab '( @@ -117,8 +117,8 @@ translate too much.") ("\\([-a-zA-Z\"`]\\)\\\\3" "\\1ß") ) "German translation table. -This table uses a conservative translation approach and may translate too -little.") +This table uses a conservative translation approach +and may translate too little.") (defvar iso-german-trans-tab iso-aggressive-german-trans-tab "Currently active translation table for German.") @@ -126,8 +126,8 @@ little.") ;;;###autoload (defun iso-german (from to &optional buffer) "Translate net conventions for German to ISO 8859-1. -The region between FROM and TO is translated using -the table `iso-german-trans-tab'. +Translate the region FROM and TO using the table +`iso-german-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-german-trans-tab)) @@ -199,8 +199,8 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ;;;###autoload (defun iso-iso2tex (from to &optional buffer) "Translate ISO 8859-1 characters to TeX sequences. -The region between FROM and TO is translated using -the table `iso-iso2tex-trans-tab'. +Translate the region between FROM and TO using the table +`iso-iso2tex-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-iso2tex-trans-tab)) @@ -386,14 +386,14 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ("!`" "¡") ) "Translation table for translating TeX sequences to ISO 8859-1 characters. -This table is not exhaustive (and due to TeX's power can never be). It only -contains commonly used sequences.") +This table is not exhaustive (and due to TeX's power can never be). +It only contains commonly used sequences.") ;;;###autoload (defun iso-tex2iso (from to &optional buffer) "Translate TeX sequences to ISO 8859-1 characters. -The region between FROM and TO is translated using -the table `iso-tex2iso-trans-tab'. +Translate the region between FROM and TO using the table +`iso-tex2iso-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-tex2iso-trans-tab)) @@ -581,8 +581,8 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ("\\\\3" "ß") ) "Translation table for translating German TeX sequences to ISO 8859-1. -This table is not exhaustive (and due to TeX's power can never be). It only -contains commonly used sequences.") +This table is not exhaustive (and due to TeX's power can never be). +It only contains commonly used sequences.") (defvar iso-iso2gtex-trans-tab '( @@ -651,8 +651,8 @@ contains commonly used sequences.") ;;;###autoload (defun iso-gtex2iso (from to &optional buffer) "Translate German TeX sequences to ISO 8859-1 characters. -The region between FROM and TO is translated using -the table `iso-gtex2iso-trans-tab'. +Translate the region between FROM and TO using the table +`iso-gtex2iso-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-gtex2iso-trans-tab)) @@ -660,8 +660,8 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ;;;###autoload (defun iso-iso2gtex (from to &optional buffer) "Translate ISO 8859-1 characters to German TeX sequences. -The region between FROM and TO is translated using -the table `iso-iso2gtex-trans-tab'. +Translate the region between FROM and TO using the table +`iso-iso2gtex-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-iso2gtex-trans-tab)) @@ -679,8 +679,8 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ;;;###autoload (defun iso-iso2duden (from to &optional buffer) "Translate ISO 8859-1 characters to Duden sequences. -The region between FROM and TO is translated using -the table `iso-iso2duden-trans-tab'. +Translate the region between FROM and TO using the table +`iso-iso2duden-trans-tab'. Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-iso2duden-trans-tab)) @@ -817,7 +817,7 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ;;;###autoload (defun iso-iso2sgml (from to &optional buffer) "Translate ISO 8859-1 characters in the region to SGML entities. -The entities used are from \"ISO 8879:1986//ENTITIES Added Latin 1//EN\". +Use entities from \"ISO 8879:1986//ENTITIES Added Latin 1//EN\". Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-iso2sgml-trans-tab)) @@ -825,7 +825,7 @@ Optional arg BUFFER is ignored (for use in `format-alist')." ;;;###autoload (defun iso-sgml2iso (from to &optional buffer) "Translate SGML entities in the region to ISO 8859-1 characters. -The entities used are from \"ISO 8879:1986//ENTITIES Added Latin 1//EN\". +Use entities from \"ISO 8879:1986//ENTITIES Added Latin 1//EN\". Optional arg BUFFER is ignored (for use in `format-alist')." (interactive "*r") (iso-translate-conventions from to iso-sgml2iso-trans-tab)) From b07a2d9cdbb2b49aae71e1103958faa3015bff2a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 12 Nov 2007 05:59:31 +0000 Subject: [PATCH 07/65] *** empty log message *** --- admin/FOR-RELEASE | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 54a3983e9a3..bff2a01ef20 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -50,6 +50,14 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html * BUGS +** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect + +** e.fennema@tiscali.nl, 9 Nov: Man reading problem + +** Stephen.Berman@gmx.net: minibuffer and current-local-map + +** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround + * DOCUMENTATION ** Check the Emacs Tutorial. From 1eb8d617f0b52c5f3134b36115cca6406d3420e2 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 13 Nov 2007 12:55:45 +0000 Subject: [PATCH 08/65] (Fw32_register_hot_key): Don't try to register hot key if w32_parse_hot_key returned nil. --- src/w32fns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/w32fns.c b/src/w32fns.c index 501fb391727..96c3ef3f7bc 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8233,7 +8233,7 @@ The return value is the hotkey-id if registered, otherwise nil. */) { key = w32_parse_hot_key (key); - if (NILP (Fmemq (key, w32_grabbed_keys))) + if (!NILP (key) && NILP (Fmemq (key, w32_grabbed_keys))) { /* Reuse an empty slot if possible. */ Lisp_Object item = Fmemq (Qnil, w32_grabbed_keys); From f1ca94970b5fc98d2ffca01690468a09e822838b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 13 Nov 2007 13:01:40 +0000 Subject: [PATCH 09/65] *** empty log message *** --- src/ChangeLog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b68915784b7..186ae87bf5c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-11-13 Juanma Barranquero + + * w32fns.c (Fw32_register_hot_key): Don't try to register hot key + if w32_parse_hot_key returned nil. + 2007-11-10 Juri Linkov * puresize.h (BASE_PURESIZE): Increase to 1130000. @@ -52,7 +57,7 @@ 2007-11-01 Johan Bockg,Ae(Brd * macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string): - Don't set s->stippled_p here, since it has already been set by + Don't set s->stippled_p here, since it has already been set by x_set_glyph_string_gc from x_draw_glyph_string. 2007-10-31 YAMAMOTO Mitsuharu @@ -3748,7 +3753,7 @@ * w32.c: Fix high cpu load for server sockets. (pfn_WSAEventSelect): New function ptr. (init_winsock): Load it. - (sys_listen): Set FILE_LISTEN flag. Set event mask for socket's + (sys_listen): Set FILE_LISTEN flag. Set event mask for socket's char_avail event object to FD_ACCEPT. (sys_accept): Check FILE_LISTEN flag. Set event mask on new socket's char_avail event object to FD_READ|FD_CLOSE. From a2e1f5e0120b9dc488390978da50b0d9b1bdbb8d Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 14 Nov 2007 09:03:45 +0000 Subject: [PATCH 10/65] *** empty log message *** --- lisp/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b5f99b55b7..32c1447ceab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2007-11-14 Nick Roberts + + * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. + (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) + (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) + (gdb-goto-breakpoint): Generalise for breakpoints with multiple + locations. + (gdb-info-breakpoints-custom, gdb-assembler-custom) + (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. + (gdb-put-breakpoint-icon): Only display icon for parent breakpoint. + 2007-11-11 Juanma Barranquero * international/iso-cvt.el (iso-translate-conventions): Doc fix. From d4b9f75c4299a22c4bb98069ee30c2d933749b96 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 14 Nov 2007 09:05:26 +0000 Subject: [PATCH 11/65] (gdb-parent-bptno-enabled): New variable. (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) (gdb-goto-breakpoint): Generalise for breakpoints with multiple locations. (gdb-info-breakpoints-custom, gdb-assembler-custom) (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. (gdb-put-breakpoint-icon): Only display icon for parent breakpoint. --- lisp/progmodes/gdb-ui.el | 94 ++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 0d1a4b05d65..4100fceb057 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -138,6 +138,7 @@ Emacs can't find.") (defvar gdb-frame-begin nil "Non-nil when GDB generates frame-begin annotation.") (defvar gdb-printing t) +(defvar gdb-parent-bptno-enabled nil) (defvar gdb-buffer-type nil "One of the symbols bound in `gdb-buffer-rules'.") @@ -1860,7 +1861,7 @@ static char *magick[] = { :group 'gud) (defconst gdb-breakpoint-regexp - "\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+") + "\\(?:\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\|\\([0-9]+\\.[0-9]+\\)\\)\\s-+\\(.\\)\\s-+") ;; Put breakpoint icons in relevant margins (even those set in the GUD buffer). (defun gdb-info-breakpoints-custom () @@ -1879,10 +1880,12 @@ static char *magick[] = { (forward-line 1) (if (looking-at gdb-breakpoint-regexp) (progn - (setq bptno (match-string 1)) - (setq flag (char-after (match-beginning 2))) + (setq bptno (or (match-string 1) (match-string 2))) + (setq flag (char-after (match-beginning 3))) + (if (match-string 1) + (setq gdb-parent-bptno-enabled (eq flag ?y))) (add-text-properties - (match-beginning 2) (match-end 2) + (match-beginning 3) (match-end 3) (if (eq flag ?y) '(face font-lock-warning-face) '(face font-lock-type-face))) @@ -1963,17 +1966,18 @@ static char *magick[] = { (save-excursion (goto-char (posn-point posn)) (if (posn-object posn) - (gdb-enqueue-input - (list - (let ((bptno (get-text-property - 0 'gdb-bptno (car (posn-string posn))))) + (let* ((bptno (get-text-property + 0 'gdb-bptno (car (posn-string posn))))) + (string-match "\\([0-9+]\\)*" bptno) + (gdb-enqueue-input + (list (concat gdb-server-prefix (if (get-text-property 0 'gdb-enabled (car (posn-string posn))) "disable " "enable ") - bptno "\n")) - 'ignore)))))))) + (match-string 1 bptno) "\n") + 'ignore))))))))) (defun gdb-mouse-toggle-breakpoint-fringe (event) "Enable/disable breakpoint in left fringe with mouse click." @@ -1991,14 +1995,16 @@ static char *magick[] = { (when (overlay-get overlay 'put-break) (setq obj (overlay-get overlay 'before-string)))) (when (stringp obj) - (gdb-enqueue-input - (list - (concat gdb-server-prefix - (if (get-text-property 0 'gdb-enabled obj) - "disable " - "enable ") - (get-text-property 0 'gdb-bptno obj) "\n") - 'ignore)))))))) + (let* ((bptno (get-text-property 0 'gdb-bptno obj))) + (string-match "\\([0-9+]\\)*" bptno) + (gdb-enqueue-input + (list + (concat gdb-server-prefix + (if (get-text-property 0 'gdb-enabled obj) + "disable " + "enable ") + (match-string 1 bptno) "\n") + 'ignore))))))))) (defun gdb-breakpoints-buffer-name () (with-current-buffer gud-comint-buffer @@ -2064,21 +2070,25 @@ static char *magick[] = { (gdb-enqueue-input (list (concat gdb-server-prefix - (if (eq ?y (char-after (match-beginning 2))) + (if (eq ?y (char-after (match-beginning 3))) "disable " "enable ") - (match-string 1) "\n") 'ignore)) + (or (match-string 1) (match-string 2)) "\n") 'ignore)) (error "Not recognized as break/watchpoint line")))) (defun gdb-delete-breakpoint () "Delete the breakpoint at current line." (interactive) - (beginning-of-line 1) - (if (looking-at gdb-breakpoint-regexp) - (gdb-enqueue-input - (list - (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore)) - (error "Not recognized as break/watchpoint line"))) + (save-excursion + (beginning-of-line 1) + (if (looking-at gdb-breakpoint-regexp) + (if (match-string 1) + (gdb-enqueue-input + (list + (concat gdb-server-prefix "delete " (match-string 1) "\n") + 'ignore)) + (message-box "This breakpoint cannot be deleted on its own.")) + (error "Not recognized as break/watchpoint line")))) (defun gdb-goto-breakpoint (&optional event) "Display the breakpoint location specified at current line." @@ -2086,7 +2096,7 @@ static char *magick[] = { (if event (posn-set-point (event-end event))) (save-excursion (beginning-of-line 1) - (if (looking-at "\\([0-9]+\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)") + (if (looking-at "\\([0-9]+\\.?[0-9]*\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)") (let ((bptno (match-string 1)) (file (match-string 2)) (line (match-string 3))) @@ -3156,6 +3166,8 @@ BUFFER nil or omitted means use the current buffer." (delete-overlay overlay)))) (defun gdb-put-breakpoint-icon (enabled bptno) + (if (string-match "[0-9+]+\\." bptno) + (setq enabled gdb-parent-bptno-enabled)) (let ((start (- (line-beginning-position) 1)) (end (+ (line-end-position) 1)) (putstring (if enabled "B" "b")) @@ -3215,8 +3227,8 @@ BUFFER nil or omitted means use the current buffer." (setq left-margin-width 2) (let ((window (get-buffer-window (current-buffer) 0))) (if window - (set-window-margins - window left-margin-width right-margin-width))))) + (set-window-margins + window left-margin-width right-margin-width))))) (gdb-put-string (propertize putstring 'face (if enabled 'breakpoint-enabled 'breakpoint-disabled)) @@ -3286,18 +3298,16 @@ BUFFER nil or omitted means use the current buffer." (goto-char (point-min)) (while (< (point) (- (point-max) 1)) (forward-line 1) - (if (looking-at "[^\t].*?breakpoint") - (progn - (looking-at - "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)") - (setq bptno (match-string 1)) - (setq flag (char-after (match-beginning 2))) - (setq address (match-string 3)) - (with-current-buffer buffer - (save-excursion - (goto-char (point-min)) - (if (search-forward address nil t) - (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))) + (when (looking-at + "\\([0-9]+\\.?[0-9]*\\).*?\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)") + (setq bptno (match-string 1)) + (setq flag (char-after (match-beginning 2))) + (setq address (match-string 3)) + (with-current-buffer buffer + (save-excursion + (goto-char (point-min)) + (if (search-forward address nil t) + (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))) (if (not (equal gdb-pc-address "main")) (with-current-buffer buffer (set-window-point (get-buffer-window buffer 0) pos))))) @@ -3458,7 +3468,7 @@ is set in them." (gdb-force-mode-line-update (propertize "ready" 'face font-lock-variable-name-face))) -; Uses "-var-list-children --all-values". Needs GDB 6.1 onwards. +; Uses "-var-list-children --all-values". Needs GDB 6.4 onwards. (defun gdb-var-list-children-1 (varnum) (gdb-enqueue-input (list From 262452334c27b061364456d41f67c3868b14aa1c Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 14 Nov 2007 10:26:09 +0000 Subject: [PATCH 12/65] (set-locale-environment): Set default-file-name-coding-system from system defaults on Windows. --- lisp/ChangeLog | 5 +++++ lisp/international/mule-cmds.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32c1447ceab..cd82ad1f0c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-14 Jason Rumney + + * international/mule-cmds.el (set-locale-environment): Set + default-file-name-coding-system from system defaults on Windows. + 2007-11-14 Nick Roberts * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index a858066f47c..bd2d03eb5d4 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2609,12 +2609,13 @@ See also `locale-charset-language-names', `locale-language-names', (setq locale-coding-system coding-system)))) ;; On Windows, override locale-coding-system, - ;; keyboard-coding-system with system codepage. Note: - ;; selection-coding-system is already set in w32select.c. + ;; default-file-name-coding-system, keyboard-coding-system, + ;; terminal-coding-system with system codepage. (when (boundp 'w32-ansi-code-page) (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) (setq locale-coding-system code-page-coding) + (setq default-file-name-coding-system code-page-coding) (set-keyboard-coding-system code-page-coding) (set-terminal-coding-system code-page-coding)))) From cca3fd48cde8c0fb92c9f7c912c5bb98783df5de Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 14 Nov 2007 20:25:02 +0000 Subject: [PATCH 13/65] (Fw32_registered_hot_keys): Don't return the nil values corresponding to deleted entries; they are an implementation detail. (gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits): Remove variables. (Fw32_define_rgb_color, Fw32_load_color_file): Fix typos in docstrings. (Fx_server_version): Reflow docstring. (Fw32_shell_execute): Doc fixes. --- src/ChangeLog | 10 +++ src/w32fns.c | 213 ++++++++++++++++++++++++-------------------------- 2 files changed, 113 insertions(+), 110 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 186ae87bf5c..8b7c9a985e4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2007-11-14 Juanma Barranquero + + * w32fns.c (Fw32_registered_hot_keys): Don't return the nil values + corresponding to deleted entries; they are an implementation detail. + (gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits): + Remove variables. + (Fw32_define_rgb_color, Fw32_load_color_file): Fix typos in docstrings. + (Fx_server_version): Reflow docstring. + (Fw32_shell_execute): Doc fixes. + 2007-11-13 Juanma Barranquero * w32fns.c (Fw32_register_hot_key): Don't try to register hot key diff --git a/src/w32fns.c b/src/w32fns.c index 96c3ef3f7bc..d86d2f1e39a 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -73,14 +73,6 @@ extern int quit_char; extern char *lispy_function_keys[]; -/* The gray bitmap `bitmaps/gray'. This is done because w32term.c uses - it, and including `bitmaps/gray' more than once is a problem when - config.h defines `static' as an empty replacement string. */ - -int gray_bitmap_width = gray_width; -int gray_bitmap_height = gray_height; -unsigned char *gray_bitmap_bits = gray_bits; - /* The colormap for converting color names to RGB values */ Lisp_Object Vw32_color_map; @@ -460,7 +452,7 @@ x_real_positions (f, xptr, yptr) DEFUN ("w32-define-rgb-color", Fw32_define_rgb_color, Sw32_define_rgb_color, 4, 4, 0, doc: /* Convert RGB numbers to a windows color reference and associate with NAME. -This adds or updates a named color to w32-color-map, making it +This adds or updates a named color to `w32-color-map', making it available for use. The original entry's RGB ref is returned, or nil if the entry is new. */) (red, green, blue, name) @@ -475,7 +467,7 @@ if the entry is new. */) CHECK_NUMBER (blue); CHECK_STRING (name); - XSETINT (rgb, RGB(XUINT (red), XUINT (green), XUINT (blue))); + XSETINT (rgb, RGB (XUINT (red), XUINT (green), XUINT (blue))); BLOCK_INPUT; @@ -500,7 +492,7 @@ if the entry is new. */) DEFUN ("w32-load-color-file", Fw32_load_color_file, Sw32_load_color_file, 1, 1, 0, doc: /* Create an alist of color entries from an external file. -Assign this value to w32-color-map to replace the existing color map. +Assign this value to `w32-color-map' to replace the existing color map. The file should define one named RGB color per line like so: R G B name @@ -935,7 +927,7 @@ x_to_w32_color (colorname) int size; color = colorname + 1; - size = strlen(color); + size = strlen (color); if (size == 3 || size == 6 || size == 9 || size == 12) { UINT colorval; @@ -953,11 +945,11 @@ x_to_w32_color (colorname) /* The check for 'x' in the following conditional takes into account the fact that strtol allows a "0x" in front of our numbers, and we don't. */ - if (!isxdigit(color[0]) || color[1] == 'x') + if (!isxdigit (color[0]) || color[1] == 'x') break; t = color[size]; color[size] = '\0'; - value = strtoul(color, &end, 16); + value = strtoul (color, &end, 16); color[size] = t; if (errno == ERANGE || end - color != size) break; @@ -987,7 +979,7 @@ x_to_w32_color (colorname) } } } - else if (strnicmp(colorname, "rgb:", 4) == 0) + else if (strnicmp (colorname, "rgb:", 4) == 0) { char *color; UINT colorval; @@ -1004,9 +996,9 @@ x_to_w32_color (colorname) /* The check for 'x' in the following conditional takes into account the fact that strtol allows a "0x" in front of our numbers, and we don't. */ - if (!isxdigit(color[0]) || color[1] == 'x') + if (!isxdigit (color[0]) || color[1] == 'x') break; - value = strtoul(color, &end, 16); + value = strtoul (color, &end, 16); if (errno == ERANGE) break; switch (end - color) @@ -1042,7 +1034,7 @@ x_to_w32_color (colorname) color = end + 1; } } - else if (strnicmp(colorname, "rgbi:", 5) == 0) + else if (strnicmp (colorname, "rgbi:", 5) == 0) { /* This is an RGB Intensity specification. */ char *color; @@ -1058,7 +1050,7 @@ x_to_w32_color (colorname) double value; UINT val; - value = strtod(color, &end); + value = strtod (color, &end); if (errno == ERANGE) break; if (value < 0.0 || value > 1.0) @@ -1556,7 +1548,6 @@ x_set_mouse_color (f, arg, oldval) #endif /* TODO */ } -/* Defined in w32term.c. */ void x_set_cursor_color (f, arg, oldval) struct frame *f; @@ -1910,7 +1901,7 @@ x_set_name (f, name, explicit) name = ENCODE_SYSTEM (name); BLOCK_INPUT; - SetWindowText(FRAME_W32_WINDOW (f), SDATA (name)); + SetWindowText (FRAME_W32_WINDOW (f), SDATA (name)); UNBLOCK_INPUT; } } @@ -1962,7 +1953,7 @@ x_set_title (f, name, old_name) name = ENCODE_SYSTEM (name); BLOCK_INPUT; - SetWindowText(FRAME_W32_WINDOW (f), SDATA (name)); + SetWindowText (FRAME_W32_WINDOW (f), SDATA (name)); UNBLOCK_INPUT; } } @@ -2009,7 +2000,7 @@ Cursor w32_load_cursor (LPCTSTR name) { /* Try first to load cursor from application resource. */ - Cursor cursor = LoadImage ((HINSTANCE) GetModuleHandle(NULL), + Cursor cursor = LoadImage ((HINSTANCE) GetModuleHandle (NULL), name, IMAGE_CURSOR, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED); if (!cursor) @@ -2050,10 +2041,10 @@ w32_createscrollbar (f, bar) { return (CreateWindow ("SCROLLBAR", "", SBS_VERT | WS_CHILD | WS_VISIBLE, /* Position and size of scroll bar. */ - XINT(bar->left) + VERTICAL_SCROLL_BAR_WIDTH_TRIM, - XINT(bar->top), - XINT(bar->width) - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, - XINT(bar->height), + XINT (bar->left) + VERTICAL_SCROLL_BAR_WIDTH_TRIM, + XINT (bar->top), + XINT (bar->width) - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, + XINT (bar->height), FRAME_W32_WINDOW (f), NULL, hinst, @@ -2433,12 +2424,12 @@ map_keypad_keys (unsigned int virt_key, unsigned int extended) } /* List of special key combinations which w32 would normally capture, - but emacs should grab instead. Not directly visible to lisp, to + but Emacs should grab instead. Not directly visible to lisp, to simplify synchronization. Each item is an integer encoding a virtual key code and modifier combination to capture. */ Lisp_Object w32_grabbed_keys; -#define HOTKEY(vk,mods) make_number (((vk) & 255) | ((mods) << 8)) +#define HOTKEY(vk, mods) make_number (((vk) & 255) | ((mods) << 8)) #define HOTKEY_ID(k) (XFASTINT (k) & 0xbfff) #define HOTKEY_VK_CODE(k) (XFASTINT (k) & 255) #define HOTKEY_MODIFIERS(k) (XFASTINT (k) >> 8) @@ -2665,7 +2656,7 @@ complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result) deferred_msg * msg_buf = find_deferred_msg (hwnd, msg); if (msg_buf == NULL) - /* Message may have been cancelled, so don't abort(). */ + /* Message may have been cancelled, so don't abort. */ return; msg_buf->result = result; @@ -2753,7 +2744,7 @@ post_character_message (hwnd, msg, wParam, lParam, modifiers) /* Detect quit_char and set quit-flag directly. Note that we still need to post a message to ensure the main thread will be - woken up if blocked in sys_select(), but we do NOT want to post + woken up if blocked in sys_select, but we do NOT want to post the quit_char message itself (because it will usually be as if the user had typed quit_char twice). Instead, we post a dummy message that has no particular effect. */ @@ -2908,7 +2899,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) /* If GetUpdateRect returns 0 (meaning there is no update region), assume the whole window needs to be repainted. */ - GetClientRect(hwnd, &wmsg.rect); + GetClientRect (hwnd, &wmsg.rect); my_post_msg (&wmsg, hwnd, msg, wParam, lParam); return 0; } @@ -3694,7 +3685,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) DWORD scrollbar_extra; RECT wr; - wp.length = sizeof(wp); + wp.length = sizeof (wp); GetWindowRect (hwnd, &wr); enter_crit (); @@ -4472,11 +4463,12 @@ DEFUN ("w32-focus-frame", Fw32_focus_frame, Sw32_focus_frame, 1, 1, 0, /* Return the charset portion of a font name. */ -char * xlfd_charset_of_font (char * fontname) +char * +xlfd_charset_of_font (char * fontname) { char *charset, *encoding; - encoding = strrchr(fontname, '-'); + encoding = strrchr (fontname, '-'); if (!encoding || encoding == fontname) return NULL; @@ -4484,7 +4476,7 @@ char * xlfd_charset_of_font (char * fontname) if (*charset == '-') break; - if (charset == fontname || strcmp(charset, "-*-*") == 0) + if (charset == fontname || strcmp (charset, "-*-*") == 0) return NULL; return charset + 1; @@ -4498,7 +4490,7 @@ static BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len, static BOOL x_to_w32_font (char *lpxstr, LOGFONT *lplogfont); static struct font_info * -w32_load_system_font (f,fontname,size) +w32_load_system_font (f, fontname, size) struct frame *f; char * fontname; int size; @@ -4601,7 +4593,7 @@ w32_load_system_font (f,fontname,size) GetFontLanguageInfo, we check the properties of the codepage directly, since that is ultimately what we are working from anyway. */ - /* font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS; */ + /* font->double_byte_p = GetFontLanguageInfo (hdc) & GCP_DBCS; */ CPINFO cpi = {0}; GetCPInfo (codepage, &cpi); font->double_byte_p = cpi.MaxCharSize > 1; @@ -4737,10 +4729,10 @@ w32_load_system_font (f,fontname,size) pointer to the structure font_info while allocating it dynamically. If loading fails, return NULL. */ struct font_info * -w32_load_font (f,fontname,size) -struct frame *f; -char * fontname; -int size; +w32_load_font (f, fontname, size) + struct frame *f; + char * fontname; + int size; { Lisp_Object bdf_fonts; struct font_info *retval = NULL; @@ -4776,7 +4768,7 @@ int size; if (retval) return retval; - return w32_load_system_font(f, fontname, size); + return w32_load_system_font (f, fontname, size); } @@ -4790,7 +4782,7 @@ w32_unload_font (dpyinfo, font) if (font->per_char) xfree (font->per_char); if (font->bdf) w32_free_bdf_font (font->bdf); - if (font->hfont) DeleteObject(font->hfont); + if (font->hfont) DeleteObject (font->hfont); xfree (font); } } @@ -4824,16 +4816,16 @@ x_to_w32_weight (lpw) { if (!lpw) return (FW_DONTCARE); - if (stricmp (lpw,"heavy") == 0) return FW_HEAVY; - else if (stricmp (lpw,"extrabold") == 0) return FW_EXTRABOLD; - else if (stricmp (lpw,"bold") == 0) return FW_BOLD; - else if (stricmp (lpw,"demibold") == 0) return FW_SEMIBOLD; - else if (stricmp (lpw,"semibold") == 0) return FW_SEMIBOLD; - else if (stricmp (lpw,"medium") == 0) return FW_MEDIUM; - else if (stricmp (lpw,"normal") == 0) return FW_NORMAL; - else if (stricmp (lpw,"light") == 0) return FW_LIGHT; - else if (stricmp (lpw,"extralight") == 0) return FW_EXTRALIGHT; - else if (stricmp (lpw,"thin") == 0) return FW_THIN; + if (stricmp (lpw, "heavy") == 0) return FW_HEAVY; + else if (stricmp (lpw, "extrabold") == 0) return FW_EXTRABOLD; + else if (stricmp (lpw, "bold") == 0) return FW_BOLD; + else if (stricmp (lpw, "demibold") == 0) return FW_SEMIBOLD; + else if (stricmp (lpw, "semibold") == 0) return FW_SEMIBOLD; + else if (stricmp (lpw, "medium") == 0) return FW_MEDIUM; + else if (stricmp (lpw, "normal") == 0) return FW_NORMAL; + else if (stricmp (lpw, "light") == 0) return FW_LIGHT; + else if (stricmp (lpw, "extralight") == 0) return FW_EXTRALIGHT; + else if (stricmp (lpw, "thin") == 0) return FW_THIN; else return FW_DONTCARE; } @@ -4879,12 +4871,12 @@ x_to_w32_charset (lpcs) Format of each entry is (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). */ - this_entry = Fassoc (build_string(charset), Vw32_charset_info_alist); + this_entry = Fassoc (build_string (charset), Vw32_charset_info_alist); - if (NILP(this_entry)) + if (NILP (this_entry)) { /* At startup, we want iso8859-1 fonts to come up properly. */ - if (stricmp(charset, "iso8859-1") == 0) + if (stricmp (charset, "iso8859-1") == 0) return ANSI_CHARSET; else return DEFAULT_CHARSET; @@ -4952,7 +4944,7 @@ w32_to_x_charset (fncharset) case ANSI_CHARSET: /* Handle startup case of w32-charset-info-alist not being set up yet. */ - if (NILP(Vw32_charset_info_alist)) + if (NILP (Vw32_charset_info_alist)) return "iso8859-1"; charset_type = Qw32_charset_ansi; break; @@ -5091,7 +5083,7 @@ w32_to_x_charset (fncharset) return buf; } - strncpy(buf, best_match, 31); + strncpy (buf, best_match, 31); buf[31] = '\0'; return buf; } @@ -5112,7 +5104,7 @@ w32_to_all_x_charsets (fncharset) case ANSI_CHARSET: /* Handle startup case of w32-charset-info-alist not being set up yet. */ - if (NILP(Vw32_charset_info_alist)) + if (NILP (Vw32_charset_info_alist)) return Fcons (build_string ("iso8859-1"), Qnil); charset_type = Qw32_charset_ansi; @@ -5272,7 +5264,7 @@ w32_codepage_for_font (char *fontname) *end = '\0'; } - entry = Fassoc (build_string(charset), Vw32_charset_info_alist); + entry = Fassoc (build_string (charset), Vw32_charset_info_alist); if (NILP (entry)) return CP_UNKNOWN; @@ -5329,9 +5321,9 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset) coding.composing = COMPOSITION_DISABLED; bufsz = decoding_buffer_size (&coding, LF_FACESIZE); - fontname = alloca(sizeof(*fontname) * bufsz); + fontname = alloca (sizeof (*fontname) * bufsz); decode_coding (&coding, lplogfont->lfFaceName, fontname, - strlen(lplogfont->lfFaceName), bufsz - 1); + strlen (lplogfont->lfFaceName), bufsz - 1); *(fontname + coding.produced) = '\0'; /* Replace dashes with underscores so the dashes are not @@ -5542,7 +5534,7 @@ x_to_w32_font (lpxstr, lplogfont) if (fields > 0) { - strncpy (lplogfont->lfFaceName,name, LF_FACESIZE); + strncpy (lplogfont->lfFaceName, name, LF_FACESIZE); lplogfont->lfFaceName[LF_FACESIZE-1] = 0; } else @@ -5741,7 +5733,7 @@ w32_font_match (fontname, pattern) } return (fast_string_match_ignore_case (build_string (regex), - build_string(font_name_copy)) >= 0); + build_string (font_name_copy)) >= 0); } /* Callback functions, and a structure holding info they need, for @@ -5976,7 +5968,8 @@ enum_fontex_cb1 (lplf, lptm, font_type, lpef) /* Interface to fontset handler. (adapted from mw32font.c in Meadow and xterm.c in Emacs 20.3) */ -static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names) +static Lisp_Object +w32_list_bdf_fonts (Lisp_Object pattern, int max_names) { char *fontname, *ptnstr; Lisp_Object list, tem, newlist = Qnil; @@ -6047,7 +6040,7 @@ w32_list_fonts (f, pattern, size, maxnames) codepage = w32_codepage_for_font (SDATA (tpat)); if (codepage != CP_8BIT && codepage != CP_UNICODE && codepage != CP_DEFAULT && codepage != CP_UNKNOWN - && !IsValidCodePage(codepage)) + && !IsValidCodePage (codepage)) continue; /* See if we cached the result for this particular query. @@ -6158,7 +6151,7 @@ w32_list_fonts (f, pattern, size, maxnames) XSETCDR (tem, make_number (0)); SelectObject (hdc, oldobj); ReleaseDC (dpyinfo->root_window, hdc); - DeleteObject(thisinfo.hfont); + DeleteObject (thisinfo.hfont); UNBLOCK_INPUT; } found_size = XINT (XCDR (tem)); @@ -6207,7 +6200,7 @@ w32_list_fonts (f, pattern, size, maxnames) Lisp_Object combined[2]; combined[0] = w32_list_bdf_fonts (pattern, maxnames - n_fonts); combined[1] = newlist; - newlist = Fnconc(2, combined); + newlist = Fnconc (2, combined); } return newlist; @@ -6234,7 +6227,7 @@ w32_query_font (struct frame *f, char *fontname) for (i = 0; i < one_w32_display_info.n_fonts ;i++, pfi++) { - if (stricmp(pfi->name, fontname) == 0) return pfi; + if (stricmp (pfi->name, fontname) == 0) return pfi; } return NULL; @@ -6271,7 +6264,7 @@ w32_find_ccl_program (fontp) } /* directory-files from dired.c. */ -Lisp_Object Fdirectory_files P_((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); +Lisp_Object Fdirectory_files P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); /* Find BDF files in a specified directory. (use GCPRO when calling, @@ -6282,13 +6275,13 @@ w32_find_bdf_fonts_in_dir (Lisp_Object directory) Lisp_Object filelist, list = Qnil; char fontname[100]; - if (!STRINGP(directory)) + if (!STRINGP (directory)) return Qnil; filelist = Fdirectory_files (directory, Qt, build_string (".*\\.[bB][dD][fF]"), Qt); - for ( ; CONSP(filelist); filelist = XCDR (filelist)) + for ( ; CONSP (filelist); filelist = XCDR (filelist)) { Lisp_Object filename = XCAR (filelist); if (w32_BDF_to_x_font (SDATA (filename), fontname, 100)) @@ -6318,8 +6311,8 @@ in the list. DIRECTORY may be a list of directories. */) pair[0] = list; pair[1] = Qnil; GCPRO2 (directory, list); - pair[1] = w32_find_bdf_fonts_in_dir( XCAR (directory) ); - list = Fnconc( 2, pair ); + pair[1] = w32_find_bdf_fonts_in_dir ( XCAR (directory) ); + list = Fnconc ( 2, pair ); UNGCPRO; } return list; @@ -6458,7 +6451,7 @@ If omitted or nil, that stands for the selected frame's display. */) /* We force 24+ bit depths to 24-bit, both to prevent an overflow and because probably is more meaningful on Windows anyway */ if (cap < 0) - cap = 1 << min(dpyinfo->n_planes * dpyinfo->n_cbits, 24); + cap = 1 << min (dpyinfo->n_planes * dpyinfo->n_cbits, 24); ReleaseDC (dpyinfo->root_window, hdc); @@ -6494,8 +6487,8 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, doc: /* Returns the version numbers of the server of DISPLAY. The value is a list of three integers: the major and minor -version numbers of the X Protocol in use, and the distributor-specific release -number. See also the function `x-server-vendor'. +version numbers of the X Protocol in use, and the distributor-specific +release number. See also the function `x-server-vendor'. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). @@ -6719,7 +6712,7 @@ terminate Emacs if we can't open the connection. */) Lisp_Object color_file; struct gcpro gcpro1; - color_file = build_string("~/rgb.txt"); + color_file = build_string ("~/rgb.txt"); GCPRO1 (color_file); @@ -7955,7 +7948,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */) *last = '\0'; } - file = DECODE_FILE(build_string (filename)); + file = DECODE_FILE (build_string (filename)); } /* User cancelled the dialog without making a selection. */ else if (!CommDlgExtendedError ()) @@ -8090,13 +8083,13 @@ DOCUMENT is typically the name of a document file or a URL, but can also be a program executable to run, or a directory to open in the Windows Explorer. -If DOCUMENT is a program executable, the optional arg PARAMETERS can -be a string containing command line parameters that will be passed to -the program; otherwise, PARAMETERS should be nil or unspecified. +If DOCUMENT is a program executable, the optional third arg PARAMETERS +can be a string containing command line parameters that will be passed +to the program; otherwise, PARAMETERS should be nil or unspecified. -Second optional argument SHOW-FLAG can be used to control how the +Optional fourth argument SHOW-FLAG can be used to control how the application will be displayed when it is invoked. If SHOW-FLAG is nil -or unspceified, the application is displayed normally, otherwise it is +or unspecified, the application is displayed normally, otherwise it is an integer representing a ShowWindow flag: 0 - start hidden @@ -8281,7 +8274,6 @@ DEFUN ("w32-unregister-hot-key", Fw32_unregister_hot_key, #else if (PostThreadMessage (dwWindowsThreadId, WM_EMACS_UNREGISTER_HOT_KEY, (WPARAM) XINT (XCAR (item)), (LPARAM) item)) - #endif { MSG msg; @@ -8297,7 +8289,7 @@ DEFUN ("w32-registered-hot-keys", Fw32_registered_hot_keys, doc: /* Return list of registered hot-key IDs. */) () { - return Fcopy_sequence (w32_grabbed_keys); + return Fdelq (Qnil, Fcopy_sequence (w32_grabbed_keys)); } DEFUN ("w32-reconstruct-hot-key", Fw32_reconstruct_hot_key, @@ -8460,10 +8452,10 @@ If the underlying system call fails, value is nil. */) LARGE_INTEGER freebytes; LARGE_INTEGER totalbytes; - if (pfn_GetDiskFreeSpaceEx(rootname, - (ULARGE_INTEGER *)&availbytes, - (ULARGE_INTEGER *)&totalbytes, - (ULARGE_INTEGER *)&freebytes)) + if (pfn_GetDiskFreeSpaceEx (rootname, + (ULARGE_INTEGER *)&availbytes, + (ULARGE_INTEGER *)&totalbytes, + (ULARGE_INTEGER *)&freebytes)) value = list3 (make_float ((double) totalbytes.QuadPart), make_float ((double) freebytes.QuadPart), make_float ((double) availbytes.QuadPart)); @@ -8475,11 +8467,11 @@ If the underlying system call fails, value is nil. */) DWORD free_clusters; DWORD total_clusters; - if (GetDiskFreeSpace(rootname, - §ors_per_cluster, - &bytes_per_sector, - &free_clusters, - &total_clusters)) + if (GetDiskFreeSpace (rootname, + §ors_per_cluster, + &bytes_per_sector, + &free_clusters, + &total_clusters)) value = list3 (make_float ((double) total_clusters * sectors_per_cluster * bytes_per_sector), make_float ((double) free_clusters @@ -8525,12 +8517,12 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name, ClosePrinter (hPrn); return Qnil; } - /* Call GetPrinter() again with big enouth memory block */ + /* Call GetPrinter again with big enouth memory block */ err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned); ClosePrinter (hPrn); if (!err) { - xfree(ppi2); + xfree (ppi2); return Qnil; } @@ -8540,23 +8532,23 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name, { /* a remote printer */ if (*ppi2->pServerName == '\\') - _snprintf(pname_buf, sizeof (pname_buf), "%s\\%s", ppi2->pServerName, - ppi2->pShareName); + _snprintf (pname_buf, sizeof (pname_buf), "%s\\%s", ppi2->pServerName, + ppi2->pShareName); else - _snprintf(pname_buf, sizeof (pname_buf), "\\\\%s\\%s", ppi2->pServerName, - ppi2->pShareName); + _snprintf (pname_buf, sizeof (pname_buf), "\\\\%s\\%s", ppi2->pServerName, + ppi2->pShareName); pname_buf[sizeof (pname_buf) - 1] = '\0'; } else { /* a local printer */ - strncpy(pname_buf, ppi2->pPortName, sizeof (pname_buf)); + strncpy (pname_buf, ppi2->pPortName, sizeof (pname_buf)); pname_buf[sizeof (pname_buf) - 1] = '\0'; /* `pPortName' can include several ports, delimited by ','. * we only use the first one. */ - strtok(pname_buf, ","); + strtok (pname_buf, ","); } - xfree(ppi2); + xfree (ppi2); } return build_string (pname_buf); @@ -8817,14 +8809,14 @@ Value must be an integer or float. */); Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); DEFVAR_LISP ("x-sensitive-text-pointer-shape", - &Vx_sensitive_text_pointer_shape, + &Vx_sensitive_text_pointer_shape, doc: /* The shape of the pointer when over mouse-sensitive text. This variable takes effect when you create a new frame or when you set the mouse color. */); Vx_sensitive_text_pointer_shape = Qnil; DEFVAR_LISP ("x-window-horizontal-drag-cursor", - &Vx_window_horizontal_drag_shape, + &Vx_window_horizontal_drag_shape, doc: /* Pointer shape to use for indicating a window can be dragged horizontally. This variable takes effect when you create a new frame or when you set the mouse color. */); @@ -9050,7 +9042,8 @@ versions of Windows) characters. */); variable initialized is 0 and directly from main when initialized is non zero. */ -void globals_of_w32fns () +void +globals_of_w32fns () { HMODULE user32_lib = GetModuleHandle ("user32.dll"); /* @@ -9077,7 +9070,7 @@ void globals_of_w32fns () void w32_abort (void) NO_RETURN; void -w32_abort() +w32_abort () { int button; button = MessageBox (NULL, @@ -9105,7 +9098,7 @@ w32_abort() /* For convenience when debugging. */ int -w32_last_error() +w32_last_error () { return GetLastError (); } From d4f60741a4a08933d65bc2911f6f0b8bab415bb8 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 15 Nov 2007 06:44:25 +0000 Subject: [PATCH 14/65] (Top): Remove Frame-Local Variables from Node Listing. --- lispref/ChangeLog | 7 ++++++- lispref/vol1.texi | 1 - lispref/vol2.texi | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 45e2a7fe6f3..36f2652dd8f 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2007-11-15 Martin Rudalics + + * vol1.texi (Top): Remove Frame-Local Variables from Node Listing. + * vol2.texi (Top): Remove Frame-Local Variables from Node Listing. + 2007-10-24 Richard Stallman * elisp.texi (Top): Delete Frame-Local Variables from subnode menu. @@ -535,7 +540,7 @@ * loading.texi (How Programs Do Loading): Fix anchor position at load-read-function definition doc. (tiny change) - + 2007-02-21 Kim F. Storm * strings.texi (Text Comparison): Mention that assoc-string diff --git a/lispref/vol1.texi b/lispref/vol1.texi index d41b2f076df..5784ed0b19b 100644 --- a/lispref/vol1.texi +++ b/lispref/vol1.texi @@ -441,7 +441,6 @@ Variables * Setting Variables:: Storing new values in variables. * Variable Scoping:: How Lisp chooses among local and global values. * Buffer-Local Variables:: Variable values in effect only in one buffer. -* Frame-Local Variables:: Variable values in effect only in one frame. * Future Local Variables:: New kinds of local values we might add some day. * File Local Variables:: Handling local variable lists in files. * Variable Aliases:: Variables that are aliases for other variables. diff --git a/lispref/vol2.texi b/lispref/vol2.texi index 515973c6281..c27f004e16f 100644 --- a/lispref/vol2.texi +++ b/lispref/vol2.texi @@ -440,7 +440,6 @@ Variables * Setting Variables:: Storing new values in variables. * Variable Scoping:: How Lisp chooses among local and global values. * Buffer-Local Variables:: Variable values in effect only in one buffer. -* Frame-Local Variables:: Variable values in effect only in one frame. * Future Local Variables:: New kinds of local values we might add some day. * File Local Variables:: Handling local variable lists in files. * Variable Aliases:: Variables that are aliases for other variables. From 7a9e614e0872d00c6e28cb974b7b8090a6c76844 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 09:24:41 +0000 Subject: [PATCH 15/65] (Fx_create_frame, Fx_display_pixel_width, Fx_display_pixel_height, Fx_display_planes, Fx_display_color_cells, Fx_server_max_request_size, Fx_server_vendor, Fx_server_version, Fx_display_backing_store, Fx_display_save_under): Fix typos in docstrings. --- src/xfns.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index f0cb26b72b4..3963311b1f4 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3036,7 +3036,7 @@ unwind_create_frame (frame) DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0, doc: /* Make a new X window, which is called a "frame" in Emacs terms. -Returns an Emacs frame object. +Return an Emacs frame object. ALIST is an alist of frame parameters. If the parameters specify that the frame should not have a minibuffer, and do not specify a specific minibuffer window to use, @@ -3593,7 +3593,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Returns the width in pixels of the X display DISPLAY. + doc: /* Return the width in pixels of the X display DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3607,7 +3607,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Returns the height in pixels of the X display DISPLAY. + doc: /* Return the height in pixels of the X display DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3621,7 +3621,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Returns the number of bitplanes of the X display DISPLAY. + doc: /* Return the number of bitplanes of the X display DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3635,7 +3635,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Returns the number of color cells of the X display DISPLAY. + doc: /* Return the number of color cells of the X display DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3660,7 +3660,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Returns the maximum request size of the X server of display DISPLAY. + doc: /* Return the maximum request size of the X server of display DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3673,7 +3673,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the "vendor ID" string of the X server of display DISPLAY. + doc: /* Return the "vendor ID" string of the X server of display DISPLAY. \(Labelling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument DISPLAY specifies which display to ask about. @@ -3690,7 +3690,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Returns the version numbers of the X server of display DISPLAY. + doc: /* Return the version numbers of the X server of display DISPLAY. The value is a list of three integers: the major and minor version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. @@ -3750,7 +3750,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Returns an indication of whether X display DISPLAY does backing store. + doc: /* Return an indication of whether X display DISPLAY does backing store. The value may be `always', `when-mapped', or `not-useful'. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). @@ -3828,7 +3828,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Returns t if the X display DISPLAY supports the save-under feature. + doc: /* Return t if the X display DISPLAY supports the save-under feature. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) From c527f5b038de30ec62c52776871e0814adba0f8e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 09:33:33 +0000 Subject: [PATCH 16/65] (Fx_create_frame, Fx_display_pixel_width, Fx_display_pixel_height, Fx_display_planes, Fx_display_color_cells, Fx_server_max_request_size, Fx_server_vendor, Fx_server_version, Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width, Fx_display_backing_store, Fx_display_visual_class, Fw32_select_font, Fx_display_save_under): Fix typos in docstrings. --- src/w32fns.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/w32fns.c b/src/w32fns.c index d86d2f1e39a..a006531f2b3 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4130,7 +4130,7 @@ unwind_create_frame (frame) DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0, doc: /* Make a new window, which is called a \"frame\" in Emacs terms. -Returns an Emacs frame object. +Return an Emacs frame object. PARAMETERS is an alist of frame parameters. If the parameters specify that the frame should not have a minibuffer, and do not specify a specific minibuffer window to use, @@ -6389,7 +6389,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Returns the width in pixels of DISPLAY. + doc: /* Return the width in pixels of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6403,7 +6403,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Returns the height in pixels of DISPLAY. + doc: /* Return the height in pixels of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6417,7 +6417,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Returns the number of bitplanes of DISPLAY. + doc: /* Return the number of bitplanes of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6431,7 +6431,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Returns the number of color cells of DISPLAY. + doc: /* Return the number of color cells of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6461,7 +6461,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Returns the maximum request size of the server of DISPLAY. + doc: /* Return the maximum request size of the server of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6474,7 +6474,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the "vendor ID" string of the W32 system (Microsoft). + doc: /* Return the "vendor ID" string of the W32 system (Microsoft). The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6485,7 +6485,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Returns the version numbers of the server of DISPLAY. + doc: /* Return the version numbers of the server of DISPLAY. The value is a list of three integers: the major and minor version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. @@ -6502,7 +6502,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, - doc: /* Returns the number of screens on the server of DISPLAY. + doc: /* Return the number of screens on the server of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6514,7 +6514,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, - doc: /* Returns the height in millimeters of DISPLAY. + doc: /* Return the height in millimeters of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6535,7 +6535,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, - doc: /* Returns the width in millimeters of DISPLAY. + doc: /* Return the width in millimeters of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6558,7 +6558,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Returns an indication of whether DISPLAY does backing store. + doc: /* Return an indication of whether DISPLAY does backing store. The value may be `always', `when-mapped', or `not-useful'. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). @@ -6571,7 +6571,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Returns the visual class of DISPLAY. + doc: /* Return the visual class of DISPLAY. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. @@ -6598,7 +6598,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Returns t if DISPLAY supports the save-under feature. + doc: /* Return t if DISPLAY supports the save-under feature. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -7979,7 +7979,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */) DEFUN ("w32-select-font", Fw32_select_font, Sw32_select_font, 0, 2, 0, doc: /* Select a font for the named FRAME using the W32 font dialog. -Returns an X-style font string corresponding to the selection. +Return an X-style font string corresponding to the selection. If FRAME is omitted or nil, it defaults to the selected frame. If INCLUDE-PROPORTIONAL is non-nil, include proportional fonts From 43831a0c63b21bb66747c3f7e474fa1273a4161b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 09:36:34 +0000 Subject: [PATCH 17/65] (Fx_create_frame, Fx_display_pixel_width, Fx_display_pixel_height, Fx_display_planes, Fx_display_color_cells, Fx_server_max_request_size, Fx_server_vendor, Fx_server_version, Fx_display_backing_store, Fx_display_visual_class, Fx_display_save_under): Fix typos in docstrings. --- src/macfns.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/macfns.c b/src/macfns.c index f2d435eb740..411340e8ad7 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -2488,7 +2488,7 @@ unwind_create_frame (frame) DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0, doc: /* Make a new window, which is called a "frame" in Emacs terms. -Returns an Emacs frame object. +Return an Emacs frame object. ALIST is an alist of frame parameters. If the parameters specify that the frame should not have a minibuffer, and do not specify a specific minibuffer window to use, @@ -2948,7 +2948,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Returns the width in pixels of DISPLAY. + doc: /* Return the width in pixels of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -2962,7 +2962,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Returns the height in pixels of DISPLAY. + doc: /* Return the height in pixels of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -2976,7 +2976,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Returns the number of bitplanes of DISPLAY. + doc: /* Return the number of bitplanes of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -2990,7 +2990,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Returns the number of color cells of DISPLAY. + doc: /* Return the number of color cells of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3006,7 +3006,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Returns the maximum request size of the server of DISPLAY. + doc: /* Return the maximum request size of the server of DISPLAY. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3019,7 +3019,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the "vendor ID" string of the Mac OS system (Apple). + doc: /* Return the "vendor ID" string of the Mac OS system (Apple). The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3030,7 +3030,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Returns the version numbers of the Mac OS system. + doc: /* Return the version numbers of the Mac OS system. The value is a list of three integers: the major and minor version numbers, and the vendor-specific release number. See also the function `x-server-vendor'. @@ -3164,7 +3164,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Returns an indication of whether DISPLAY does backing store. + doc: /* Return an indication of whether DISPLAY does backing store. The value may be `always', `when-mapped', or `not-useful'. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). @@ -3177,7 +3177,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Returns the visual class of DISPLAY. + doc: /* Return the visual class of DISPLAY. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. @@ -3208,7 +3208,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Returns t if DISPLAY supports the save-under feature. + doc: /* Return t if DISPLAY supports the save-under feature. The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) From bb189688f6f92a8a6c2c8cb9c94faec486206e74 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 09:53:02 +0000 Subject: [PATCH 18/65] *** empty log message *** --- src/ChangeLog | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 8b7c9a985e4..1899b577f74 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,23 @@ +2007-11-15 Juanma Barranquero + + * macfns.c (Fx_create_frame, Fx_display_pixel_width) + (Fx_display_pixel_height, Fx_display_planes) + (Fx_display_color_cells, Fx_server_max_request_size) + (Fx_server_vendor, Fx_server_version, Fx_display_backing_store) + (Fx_display_visual_class, Fx_display_save_under): + * w32fns.c (Fx_create_frame, Fx_display_pixel_width) + (Fx_display_pixel_height, Fx_display_planes) + (Fx_display_color_cells, Fx_server_max_request_size) + (Fx_server_vendor, Fx_server_version, Fx_display_screens) + (Fx_display_mm_height, Fx_display_mm_width) + (Fx_display_backing_store, Fx_display_visual_class) + (Fw32_select_font, Fx_display_save_under): + * xfns.c (Fx_create_frame, Fx_display_pixel_width) + (Fx_display_pixel_height, Fx_display_planes) + (Fx_display_color_cells, Fx_server_max_request_size) + (Fx_server_vendor, Fx_server_version, Fx_display_backing_store) + (Fx_display_save_under): Fix typos in docstrings. + 2007-11-14 Juanma Barranquero * w32fns.c (Fw32_registered_hot_keys): Don't return the nil values From 9ffb952120776aec512cabc9bb5af660f016bcac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 11:52:42 +0000 Subject: [PATCH 19/65] (url-retrieve-synchronously): Call delete-process. --- lisp/url/ChangeLog | 4 ++++ lisp/url/url.el | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 146d224435b..7402de41aab 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2007-11-15 Richard Stallman + + * url.el (url-retrieve-synchronously): Call delete-process. + 2007-10-13 Richard Stallman * url-util.el (url-basepath): Function deleted. diff --git a/lisp/url/url.el b/lisp/url/url.el index 1af016ff0ba..98dc939af99 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -240,7 +240,9 @@ no further processing). URL is either a string or a parsed URL." ;; XXX: The callback must always be called. Any ;; exception is a bug that should be fixed, not worked ;; around. - (setq retrieval-done t)) + (progn ;; Call delete-process so we run any sentinel now. + (delete-process proc) + (setq retrieval-done t))) ;; We used to use `sit-for' here, but in some cases it wouldn't ;; work because apparently pending keyboard input would always ;; interrupt it before it got a chance to handle process input. From 0a3333b5a69175bf284406e98a01a09b65f26b60 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 11:55:59 +0000 Subject: [PATCH 20/65] (Equality Predicates): Delete `eql'. (Predicates, Naming Conventions, Top): Delete `eql'. (Common Lisp Compatibility): Delete `eql'. (Porting Common Lisp): Delete obsolete backquote info. Minor clarification about character constants. (Sequence Basics): Minor clarification. --- man/cl.texi | 63 ++++++++++------------------------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/man/cl.texi b/man/cl.texi index 676b9edc5ad..0a09caee98e 100644 --- a/man/cl.texi +++ b/man/cl.texi @@ -62,14 +62,14 @@ does assume a basic familiarity with Emacs Lisp. @menu * Overview:: Installation, usage, etc. * Program Structure:: Arglists, `eval-when', `defalias' -* Predicates:: `typep', `eql', and `equalp' +* Predicates:: `typep' and `equalp' * Control Structure:: `setf', `do', `loop', etc. * Macros:: Destructuring, `define-compiler-macro' * Declarations:: `proclaim', `declare', etc. * Symbols:: Property lists, `gensym' * Numbers:: Predicates, functions, random numbers * Sequences:: Mapping, functions, searching, sorting -* Lists:: `cadr', `sublis', `member*', `assoc*', etc. +* Lists:: `caddr', `sublis', `member*', `assoc*', etc. * Structures:: `defstruct' * Assertions:: `check-type', `assert', `ignore-errors'. @@ -287,7 +287,7 @@ The following simple functions and macros are defined in @file{cl.el}; they do not cause other components like @file{cl-extra} to be loaded. @example -eql floatp-safe endp +floatp-safe endp evenp oddp plusp minusp caaar .. cddddr list* ldiff rest first .. tenth @@ -700,7 +700,7 @@ facts are true or false. @menu * Type Predicates:: `typep', `deftype', and `coerce' -* Equality Predicates:: `eql' and `equalp' +* Equality Predicates:: `equalp' @end menu @node Type Predicates, Equality Predicates, Predicates, Predicates @@ -840,40 +840,7 @@ arguments to specify the type of sequence to return. @xref{Sequences}. @section Equality Predicates @noindent -This package defines two Common Lisp predicates, @code{eql} and -@code{equalp}. - -@defun eql a b -This function is almost the same as @code{eq}, except that if @var{a} -and @var{b} are numbers of the same type, it compares them for numeric -equality (as if by @code{equal} instead of @code{eq}). This makes a -difference only for versions of Emacs that are compiled with -floating-point support. Emacs floats are allocated -objects just like cons cells, which means that @code{(eq 3.0 3.0)} -will not necessarily be true---if the two @code{3.0}s were allocated -separately, the pointers will be different even though the numbers are -the same. But @code{(eql 3.0 3.0)} will always be true. - -The types of the arguments must match, so @code{(eql 3 3.0)} is -still false. - -Note that Emacs integers are ``direct'' rather than allocated, which -basically means @code{(eq 3 3)} will always be true. Thus @code{eq} -and @code{eql} behave differently only if floating-point numbers are -involved, and are indistinguishable on Emacs versions that don't -support floats. - -There is a slight inconsistency with Common Lisp in the treatment of -positive and negative zeros. Some machines, notably those with IEEE -standard arithmetic, represent @code{+0} and @code{-0} as distinct -values. Normally this doesn't matter because the standard specifies -that @code{(= 0.0 -0.0)} should always be true, and this is indeed -what Emacs Lisp and Common Lisp do. But the Common Lisp standard -states that @code{(eql 0.0 -0.0)} and @code{(equal 0.0 -0.0)} should -be false on IEEE-like machines; Emacs Lisp does not do this, and in -fact the only known way to distinguish between the two zeros in Emacs -Lisp is to @code{format} them and check for a minus sign. -@end defun +This package defines the Common Lisp predicate @code{equalp}. @defun equalp a b This function is a more flexible version of @code{equal}. In @@ -3685,7 +3652,7 @@ the same sequence, in the same order as they appear in that sequence.) The @code{:test} argument specifies a function which must return true (non-@code{nil}) to indicate a match; instead, you may use @code{:test-not} to give a function which returns @emph{false} to -indicate a match. The default test function is @code{:test 'eql}. +indicate a match. The default test function is @code{eql}. Many functions which take @var{item} and @code{:test} or @code{:test-not} arguments also come in @code{-if} and @code{-if-not} varieties, @@ -4998,7 +4965,7 @@ which understand full-featured argument lists. The @code{&whole} keyword does not work in @code{defmacro} argument lists (except inside recursive argument lists). -The @code{eql} and @code{equal} predicates do not distinguish +The @code{equal} predicate does not distinguish between IEEE floating-point plus and minus zero. The @code{equalp} predicate has several differences with Common Lisp; @pxref{Predicates}. @@ -5218,12 +5185,6 @@ whereas Emacs Lisp's parser just treats quote as a special case. Some Lisp packages use reader macros to create special syntaxes for themselves, which the Emacs parser is incapable of reading. -The lack of reader macros, incidentally, is the reason behind -Emacs Lisp's unusual backquote syntax. Since backquotes are -implemented as a Lisp package and not built-in to the Emacs -parser, they are forced to use a regular macro named @code{`} -which is used with the standard function/macro call notation. - @item Other syntactic features. Common Lisp provides a number of notations beginning with @code{#} that the Emacs Lisp parser @@ -5287,11 +5248,11 @@ matters, Emacs has its own @code{#(} notation for something entirely different---strings with properties. @item -Characters are distinct from integers in Common Lisp. The -notation for character constants is also different: @code{#\A} -instead of @code{?A}. Also, @code{string=} and @code{string-equal} -are synonyms in Emacs Lisp whereas the latter is case-insensitive -in Common Lisp. +Characters are distinct from integers in Common Lisp. The notation +for character constants is also different: @code{#\A} in Common Lisp +where Emacs Lisp uses @code{?A}. Also, @code{string=} and +@code{string-equal} are synonyms in Emacs Lisp, whereas the latter is +case-insensitive in Common Lisp. @item Data types. Some Common Lisp data types do not exist in Emacs From a5ab2e0c993791bf3bb1a0dc9378119fc44a6e2e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 11:58:22 +0000 Subject: [PATCH 21/65] (Communication Coding): Document x-select-request-type. --- man/ChangeLog | 13 +++++++++++++ man/mule.texi | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/man/ChangeLog b/man/ChangeLog index 5dc97b83329..5b4b7bc6bba 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,16 @@ +2007-11-15 Richard Stallman + + * cl.texi (Equality Predicates): Delete `eql'. + (Predicates, Naming Conventions, Top): Delete `eql'. + (Common Lisp Compatibility): Delete `eql'. + (Porting Common Lisp): Delete obsolete backquote info. + Minor clarification about character constants. + (Sequence Basics): Minor clarification. + +2007-11-15 Kenichi Handa + + * mule.texi (Communication Coding): Document x-select-request-type. + 2007-11-11 Glenn Morris * calendar.texi (Special Diary Entries): Fix Thanksgiving example. diff --git a/man/mule.texi b/man/mule.texi index c71c820dc27..018521dff42 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -1103,6 +1103,15 @@ specified by one of the environment variables @env{LC_ALL}, specified above, whose value is nonempty is the one that determines the text representation.) +@vindex x-select-request-type + The variable @code{x-select-request-type} specifies a selection data +type of selection to request from the X server. The default value is +@code{nil}, which means Emacs tries @code{COMPOUND_TEXT} and +@code{UTF8_STRING}, and uses whichever result seems more appropriate. +You can explicitly specify the data type by setting the variable to +one of the symbols @code{COMPOUND_TEXT}, @code{UTF8_STRING}, +@code{STRING} and @code{TEXT}. + @node File Name Coding @section Coding Systems for File Names From 65540e58e7fd1a6ad8d6d8ca757471085159ac9d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 12:00:15 +0000 Subject: [PATCH 22/65] Minibuffer map bindings moved to bindings.el. --- lisp/filecache.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lisp/filecache.el b/lisp/filecache.el index baa171d535a..30c3e50e6af 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -780,10 +780,6 @@ match REGEXP." ;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;###autoload (define-key minibuffer-local-completion-map [C-tab] 'file-cache-minibuffer-complete) -;;;###autoload (define-key minibuffer-local-map [C-tab] 'file-cache-minibuffer-complete) -;;;###autoload (define-key minibuffer-local-must-match-map [C-tab] 'file-cache-minibuffer-complete) - (provide 'filecache) ;;; arch-tag: 433d3ca4-4af2-47ce-b2cf-1f727460f538 From 2d914448d5347cf3ad709d538b949f34f529407a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 12:01:04 +0000 Subject: [PATCH 23/65] (minibuffer-local-map): Bind C-tab here; moved from filecache.el. --- lisp/bindings.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/bindings.el b/lisp/bindings.el index 3c7237a52fa..27d8cc62606 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -680,7 +680,8 @@ language you are using." ;; Override the global binding (which calls indent-relative via ;; indent-for-tab-command). The alignment that indent-relative tries to ;; do doesn't make much sense here since the prompt messes it up. - (define-key map "\t" 'self-insert-command)) + (define-key map "\t" 'self-insert-command) + (define-key minibuffer-local-map [C-tab] 'file-cache-minibuffer-complete)) (define-key global-map "\C-u" 'universal-argument) (let ((i ?0)) From 712013730319937ab9e514a0d10719c7e075b689 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 12:04:38 +0000 Subject: [PATCH 24/65] (add-change-log-entry-other-window): Key binding C-x 4 a moved to bindings.el. --- lisp/add-log.el | 1 - 1 file changed, 1 deletion(-) diff --git a/lisp/add-log.el b/lisp/add-log.el index d60580a1c0d..4fb2815d6e5 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -665,7 +665,6 @@ the change log file in another window." (list current-prefix-arg (prompt-for-change-log-name)))) (add-change-log-entry whoami file-name t)) -;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) (defvar change-log-indent-text 0) From 8c1a99611b8b98236f6f513bbc2fef66f55f8de6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 12:08:27 +0000 Subject: [PATCH 25/65] (reposition-window): Binding C-M-l moved to bindings.el. --- lisp/reposition.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/lisp/reposition.el b/lisp/reposition.el index 3a5f24cbe8f..6ebbe57840d 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -171,8 +171,6 @@ first comment line visible (if point is in a comment)." ;;(repos-debug-macro "4") )))) -;;;###autoload (define-key esc-map "\C-l" 'reposition-window) - ;;; Auxiliary functions ;; Return number of screen lines between START and END. From ef2cfb2e80c76365599cf9a4361acff82a3f6793 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Nov 2007 12:09:11 +0000 Subject: [PATCH 26/65] (esc-map): Bind C-M-l here; moved from reposition.el. (ctl-x-4-map): Bind C-x 4 a here; moved from add-log.el. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/bindings.el | 3 +++ 2 files changed, 20 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd82ad1f0c8..8a847ec9e12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2007-11-15 Richard Stallman + + * bindings.el (esc-map): Bind C-M-l here; moved from reposition.el. + + * reposition.el (reposition-window): + Binding C-M-l moved to bindings.el. + + * bindings.el (ctl-x-4-map): Bind C-x 4 a here; moved from add-log.el. + + * add-log.el (add-change-log-entry-other-window): + Key binding C-x 4 a moved to bindings.el. + + * bindings.el (minibuffer-local-map): Bind C-tab here; moved + from filecache.el. + + * filecache.el: Minibuffer map bindings moved to bindings.el. + 2007-11-14 Jason Rumney * international/mule-cmds.el (set-locale-environment): Set diff --git a/lisp/bindings.el b/lisp/bindings.el index 27d8cc62606..eefc66b22c4 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1051,6 +1051,9 @@ language you are using." (define-key ctl-x-map "z" 'repeat) +(define-key esc-map "\C-l" 'reposition-window) + +(define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) (define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window) ;; Signal handlers From 6e096c718f185c5a600321b67a03f02be521de59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Potort=C3=AC?= Date: Thu, 15 Nov 2007 13:37:42 +0000 Subject: [PATCH 27/65] etags.c: (C_entries): In case '}', set fvdef to fvnone unconditioned to (!ignoreindent && lp == newlb.buffer + 1). --- lib-src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a4e519e8954..66fa2b91a09 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2007-11-15 Masatake YAMATO + + * etags.c (C_entries): In case '}', set fvdef to fvnone + unconditioned to (!ignoreindent && lp == newlb.buffer + 1). + 2007-10-26 Juanma Barranquero * emacsclient.c: Add a wrapper for getenv so it also checks the From 1fc0c6247c2b8c0102028d1ba95d9bcc03d3f1e4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:27:06 +0000 Subject: [PATCH 28/65] (c-crosses-statement-barrier-p): Fix typo in docstring. --- lisp/progmodes/cc-engine.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index d1a27d567fd..fa41d247c59 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -604,7 +604,7 @@ comment at the start of cc-engine.el for more info." ;; (e.g. if). ;; ;; - ;; The following diagram briefly outlines the PDA. + ;; The following diagram briefly outlines the PDA. ;; ;; Common state: ;; "else": Push state, goto state `else'. @@ -1079,7 +1079,7 @@ single `?' is found, then `c-maybe-labelp' is cleared. For AWK, a statement which is terminated by an EOL (not a \; or a }) is regarded as having a \"virtual semicolon\" immediately after the last token on -the line. If this virtual semicolon is _at_ from, the function recognises it. +the line. If this virtual semicolon is _at_ from, the function recognizes it. Note that this function might do hidden buffer changes. See the comment at the start of cc-engine.el for more info." @@ -1916,7 +1916,7 @@ comment at the start of cc-engine.el for more info." (defun c-partial-ws-p (beg end) ;; Is the region (beg end) WS, and is there WS (or BOB/EOB) next to the ;; region? This is a "heuristic" function. ..... - ;; + ;; ;; The motivation for the second bit is to check whether removing this ;; region would coalesce two symbols. ;; @@ -3291,7 +3291,7 @@ comment at the start of cc-engine.el for more info." ;; The workaround for this is for the AWK Mode initialisation to switch the ;; defalias for c-in-literal to c-slow-in-literal. This will slow down other ;; cc-modes in Xemacs whenever an awk-buffer has been initialised. -;; +;; ;; (Alan Mackenzie, 2003/4/30). (defun c-fast-in-literal (&optional lim detect-cpp) @@ -3406,7 +3406,7 @@ comment at the start of cc-engine.el for more info." (if (and (consp range) (progn (goto-char (car range)) (looking-at c-line-comment-starter))) - (let ((col (current-column)) + (let ((col (current-column)) (beg (point)) (bopl (c-point 'bopl)) (end (cdr range))) @@ -4042,7 +4042,7 @@ comment at the start of cc-engine.el for more info." ;; example, this happens to "foo" when "foo \n bar();" becomes ;; "foo(); \n bar();". Such stale types, if not removed, foul up ;; the fontification. - ;; + ;; ;; Have we, perhaps, added non-ws characters to the front/back of a found ;; type? (when (> end beg) @@ -4061,7 +4061,7 @@ comment at the start of cc-engine.el for more info." (c-beginning-of-current-token))) (c-unfind-type (buffer-substring-no-properties (point) beg)))))) - + (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o") (cond ;; Changing the amount of (already existing) whitespace - don't do anything. @@ -5926,7 +5926,7 @@ comment at the start of cc-engine.el for more info." macro-start ; if we're in one. label-type) (cond - ;; "case" or "default" (Doesn't apply to AWK). + ;; "case" or "default" (Doesn't apply to AWK). ((looking-at c-label-kwds-regexp) (let ((kwd-end (match-end 1))) ;; Record only the keyword itself for fontification, since in @@ -6045,7 +6045,7 @@ comment at the start of cc-engine.el for more info." (c-forward-label nil pte start)))))))))) ;; Point is still at the beginning of the possible label construct. - ;; + ;; ;; Check that the next nonsymbol token is ":", or that we're in one ;; of QT's "slots" declarations. Allow '(' for the sake of macro ;; arguments. FIXME: Should build this regexp from the language @@ -6071,7 +6071,7 @@ comment at the start of cc-engine.el for more info." (and (c-major-mode-is 'c++-mode) (string-match "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>" - (buffer-substring start (point))))) + (buffer-substring start (point))))) (c-forward-syntactic-ws limit) (cond ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon. @@ -7235,7 +7235,7 @@ comment at the start of cc-engine.el for more info." ;; needed with further syntax elements of the types `substatement', ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and ;; `defun-block-intro'. - ;; + ;; ;; Do the generic processing to anchor the given syntax symbol on ;; the preceding statement: Skip over any labels and containing ;; statements on the same line, and then search backward until we @@ -7421,7 +7421,7 @@ comment at the start of cc-engine.el for more info." c-other-decl-block-key-in-symbols-alist)) (max (c-point 'boi paren-pos) (point)))) (t (c-add-syntax 'defun-block-intro nil)))) - + (c-add-syntax 'statement-block-intro nil))) (if (= paren-pos boi) @@ -8261,7 +8261,7 @@ comment at the start of cc-engine.el for more info." 'statement-cont) nil nil containing-sexp paren-state)) )) - + ;; CASE 5F: Close of a non-class declaration level block. ((and (eq char-after-ip ?}) (c-keyword-member containing-decl-kwd From a198d2c9158ca14968181e2af9d145e94d425f0a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:32:34 +0000 Subject: [PATCH 29/65] (cua-highlight-region-shift-only, cua-paste-pop): Fix typos in docstrings. --- lisp/ChangeLog | 8 ++++++++ lisp/emulation/cua-base.el | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a847ec9e12..a45abc3e3ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-11-15 Juanma Barranquero + + * progmodes/cc-engine.el (c-crosses-statement-barrier-p): + Fix typo in docstring. + + * emulation/cua-base.el (cua-paste-pop): Fix typo in docstring. + (cua-highlight-region-shift-only): Doc fix. + 2007-11-15 Richard Stallman * bindings.el (esc-map): Bind C-M-l here; moved from reposition.el. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e5410c272ff..62fa2bd7bbb 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -286,7 +286,7 @@ enabled." "*If non-nil, only highlight region if marked with S-. When this is non-nil, CUA toggles `transient-mark-mode' on when the region is marked using shifted movement keys, and off when the mark is cleared. -But when the mark was set using \\[cua-set-mark], transient-mark-mode +But when the mark was set using \\[cua-set-mark], Transient Mark mode is not turned on." :type 'boolean :group 'cua) @@ -951,8 +951,8 @@ If global mark is active, copy from register or one character." (defun cua-paste-pop (arg) "Replace a just-pasted text or rectangle with a different text. -See `yank-pop' for details about the default behaviour. For an alternative -behaviour, see `cua-paste-pop-rotate-temporarily'." +See `yank-pop' for details about the default behavior. For an alternative +behavior, see `cua-paste-pop-rotate-temporarily'." (interactive "P") (cond ((eq last-command 'cua--paste-rectangle) From ec77ae0a9ec78d58dd34470fbe5d581924d20b86 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:35:11 +0000 Subject: [PATCH 30/65] (erc-open): Fix typo in docstring. --- lisp/erc/erc.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index c26bdf2a19f..d5480bd4b19 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1910,7 +1910,7 @@ already connected and just create a separate buffer for the new target CHANNEL. Use PASSWD as user password on the server. If TGT-LIST is -non-nil, use it to initialise `erc-default-recipients'. +non-nil, use it to initialize `erc-default-recipients'. Returns the buffer for the given server or channel." (let ((server-announced-name (when (and (boundp 'erc-session-server) From fb70b793a8c91b7fffc1c7ea2aa8ac03a13604b4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:36:38 +0000 Subject: [PATCH 31/65] (define-erc-response-handler): Fix typos in docstring. --- lisp/erc/erc-backend.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 349f9137066..e03c8964ca3 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1000,13 +1000,13 @@ NAME is the response name as sent by the server (see the IRC RFC for meanings). This creates: - - a hook variable `erc-server-NAME-functions' initialised to `erc-server-NAME'. + - a hook variable `erc-server-NAME-functions' initialized to `erc-server-NAME'. - a function `erc-server-NAME' with body FN-BODY. If ALIASES is non-nil, each alias in ALIASES is `defalias'ed to `erc-server-NAME'. Alias hook variables are created as `erc-server-ALIAS-functions' and -initialised to the same default value as `erc-server-NAME-functions'. +initialized to the same default value as `erc-server-NAME-functions'. FN-BODY is the body of `erc-server-NAME' it may refer to the two function arguments PROC and PARSED. From 6b4e9327c3becadf37ecb5201d49c4db3fe04e95 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:39:04 +0000 Subject: [PATCH 32/65] (log): Fix typo in docstring. --- lisp/erc/erc-log.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 88132afae0c..651b80399ee 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -195,7 +195,7 @@ format is defined through a formatting function on Since automatic logging is not always a Good Thing (especially if people say things in different coding systems), you can turn logging -behaviour on and off with the variable `erc-enable-logging', which can +behavior on and off with the variable `erc-enable-logging', which can also be a predicate function. To only log when you are not set away, use: \(setq erc-enable-logging @@ -385,7 +385,7 @@ You can save every individual message by putting this function on (with-current-buffer buffer (save-restriction (widen) - ;; early on in the initalisation, don't try and write the log out + ;; early on in the initialization, don't try and write the log out (when (and (markerp erc-last-saved-position) (> erc-insert-marker (1+ erc-last-saved-position))) (write-region (1+ (marker-position erc-last-saved-position)) From aba30bafac6d831607cc7675cec0e0f214c78e2a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:41:18 +0000 Subject: [PATCH 33/65] (erc-log-matches): Fix typos in docstring. --- lisp/erc/ChangeLog | 7 +++++++ lisp/erc/erc-match.el | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index d72d472d69f..e78222c3254 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,10 @@ +2007-11-15 Juanma Barranquero + + * erc.el (erc-open): + * erc-backend.el (define-erc-response-handler): + * erc-log.el (log): + * erc-match.el (erc-log-matches): Fix typos in docstrings. + 2007-08-08 Glenn Morris * erc-log.el, erc.el: Replace `iff' in doc-strings and comments. diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index c147b6566f8..a4752588ebd 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -530,11 +530,11 @@ Use this defun with `erc-insert-modify-hook'." (defun erc-log-matches (match-type nickuserhost message) "Log matches in a separate buffer, determined by MATCH-TYPE. -The behaviour of this function is controlled by the variables -`erc-log-matches-types-alist' and `erc-log-matches-flag'. Specify the -match types which should be logged in the former, and -deactivate/activate match logging in the latter. See -`erc-log-match-format'." +The behavior of this function is controlled by the variables +`erc-log-matches-types-alist' and `erc-log-matches-flag'. +Specify the match types which should be logged in the former, +and deactivate/activate match logging in the latter. +See `erc-log-match-format'." (let ((match-buffer-name (cdr (assq match-type erc-log-matches-types-alist))) (nick (nth 0 (erc-parse-user nickuserhost)))) From c90722b60976b5c0093a2d10a09e0ec9d9e0c0a4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:44:29 +0000 Subject: [PATCH 34/65] (gnus-uu-default-view-rules): Fix typos in docstring. (gnus-uu-decode-save): Fix typo in prompt. --- lisp/gnus/gnus-uu.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 94fb854c960..272957702b2 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -75,7 +75,7 @@ ("\\.\\(tar\\|arj\\|zip\\|zoo\\|arc\\|gz\\|Z\\|lzh\\|ar\\|lha\\)$" "gnus-uu-archive")) "*Default actions to be taken when the user asks to view a file. -To change the behaviour, you can either edit this variable or set +To change the behavior, you can either edit this variable or set `gnus-uu-user-view-rules' to something useful. For example: @@ -95,7 +95,7 @@ at that point in the command string. If there's no \"%s\" in the command string, the file name will be appended to the command string before executing. -There are several user variables to tailor the behaviour of gnus-uu to +There are several user variables to tailor the behavior of gnus-uu to your needs. First we have `gnus-uu-user-view-rules', which is the variable gnus-uu first consults when trying to decide how to view a file. If this variable contains no matches, gnus-uu examines the @@ -393,7 +393,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (list current-prefix-arg (read-file-name (if gnus-uu-save-separate-articles - "Save articles is dir: " + "Save articles in dir: " "Save articles in file: ") gnus-uu-default-dir gnus-uu-default-dir))) From eadfb8869e89ff13651771687654bf116a1cd320 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:47:51 +0000 Subject: [PATCH 35/65] (gnus-demon): Fix typo in docstring. --- lisp/gnus/ChangeLog | 10 +++++++++- lisp/gnus/gnus-demon.el | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 728ef10c747..5712ed059f4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2007-11-15 Juanma Barranquero + + * nnimap.el (nnimap-split-download-body): + * gnus-demon.el (gnus-demon): Fix typos in docstrings. + + * gnus-uu.el (gnus-uu-default-view-rules): Fix typos in docstring. + (gnus-uu-decode-save): Fix typo in prompt. + 2007-11-03 Reiner Steib * gnus-sum.el (gnus-summary-highlight): Mark as risky local variable. @@ -64,7 +72,7 @@ 2007-10-04 Reiner Steib - * Relicense "GPLv2 or later" files to "GPLv3 or later". + * Relicense "GPLv2 or later" files to "GPLv3 or later". 2007-09-13 Katsumi Yamaoka diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el index 715e77a7099..7a79adce49a 100644 --- a/lisp/gnus/gnus-demon.el +++ b/lisp/gnus/gnus-demon.el @@ -43,7 +43,7 @@ (autoload 'parse-time-string "parse-time" nil nil) (defgroup gnus-demon nil - "Demonic behaviour." + "Demonic behavior." :group 'gnus) (defcustom gnus-demon-handlers nil From c954c162d5e103d1b4f77849c0b288c4987a3145 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 18:48:35 +0000 Subject: [PATCH 36/65] (nnimap-split-download-body): Fix typo in docstring. --- lisp/gnus/nnimap.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index ba23280658a..dad6758300b 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -208,7 +208,7 @@ This is generally not required, and will slow things down considerably. You may need it if you want to use an advanced splitting function that analyzes the body before splitting the article. If this variable is nil, bodies will not be downloaded; if this -variable is the symbol `default' the default behaviour is +variable is the symbol `default' the default behavior is used (which currently is nil, unless you use a statistical spam.el test); if this variable is another non-nil value bodies will be downloaded." From 3b58b87349b6d8bae3ad7c8da3affec6d435de29 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 15 Nov 2007 22:13:17 +0000 Subject: [PATCH 37/65] (Electric Keys, Custom Macros): Fix typos. --- man/ChangeLog | 4 ++++ man/cc-mode.texi | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/man/ChangeLog b/man/ChangeLog index 5b4b7bc6bba..955ce866033 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2007-11-15 Juanma Barranquero + + * cc-mode.texi (Electric Keys, Custom Macros): Fix typos. + 2007-11-15 Richard Stallman * cl.texi (Equality Predicates): Delete `eql'. diff --git a/man/cc-mode.texi b/man/cc-mode.texi index 423892d7d30..af16e6553f2 100644 --- a/man/cc-mode.texi +++ b/man/cc-mode.texi @@ -1228,7 +1228,7 @@ reindenting the line. This reindentation saves you from having to reindent a line manually after typing, say, a @samp{@}}. A few keywords, such as @code{else}, also trigger electric action. -You can inhibit the electric behaviour described here by disabling +You can inhibit the electric behavior described here by disabling electric minor mode (@pxref{Minor Modes}). Common to all these keys is that they only behave electrically when @@ -1281,7 +1281,7 @@ whitespace before it). Additionally, you can configure @ccmode{} so that typing a slash at the start of a line within a block comment will terminate the comment. You don't need to have electric minor mode enabled to get -this behaviour. @xref{Clean-ups}. +this behavior. @xref{Clean-ups}. In AWK mode, @samp{*} and @samp{/} do not delimit comments and are not electric. @@ -6458,7 +6458,7 @@ functions to this hook, not remove them. @xref{Style Variables}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Normally, the lines in a multi-line macro are indented relative to -each other as though they were code. You can suppress this behaviour +each other as though they were code. You can suppress this behavior by setting the following user option: @defopt c-syntactic-indentation-in-macros From f52fcaa4f399a0f96d4be0bcaa8342818f15e82b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 15 Nov 2007 23:45:21 +0000 Subject: [PATCH 38/65] (Fformat): Correctly format EMACS_INT values. --- src/ChangeLog | 4 ++++ src/editfns.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1899b577f74..c6c2db23f12 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-11-15 Andreas Schwab + + * editfns.c (Fformat): Correctly format EMACS_INT values. + 2007-11-15 Juanma Barranquero * macfns.c (Fx_create_frame, Fx_display_pixel_width) diff --git a/src/editfns.c b/src/editfns.c index 6c6742d242e..fb9c1c96b59 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3803,23 +3803,35 @@ usage: (format STRING &rest OBJECTS) */) format - this_format_start); this_format[format - this_format_start] = 0; - if (INTEGERP (args[n])) - { - if (format[-1] == 'd') - sprintf (p, this_format, XINT (args[n])); - /* Don't sign-extend for octal or hex printing. */ - else - sprintf (p, this_format, XUINT (args[n])); - } - else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') + if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') sprintf (p, this_format, XFLOAT_DATA (args[n])); - else if (format[-1] == 'd') - /* Maybe we should use "%1.0f" instead so it also works - for values larger than MAXINT. */ - sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); else - /* Don't sign-extend for octal or hex printing. */ - sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); + { + if (sizeof (EMACS_INT) > sizeof (int)) + { + /* Insert 'l' before format spec. */ + this_format[format - this_format_start] + = this_format[format - this_format_start - 1]; + this_format[format - this_format_start - 1] = 'l'; + this_format[format - this_format_start + 1] = 0; + } + + if (INTEGERP (args[n])) + { + if (format[-1] == 'd') + sprintf (p, this_format, XINT (args[n])); + /* Don't sign-extend for octal or hex printing. */ + else + sprintf (p, this_format, XUINT (args[n])); + } + else if (format[-1] == 'd') + /* Maybe we should use "%1.0f" instead so it also works + for values larger than MAXINT. */ + sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); + else + /* Don't sign-extend for octal or hex printing. */ + sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); + } if (p > buf && multibyte From b322c2058fb39e1c3c3bd1576d43cf6e25573002 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 15 Nov 2007 23:53:10 +0000 Subject: [PATCH 39/65] Fix last change. --- src/editfns.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/editfns.c b/src/editfns.c index fb9c1c96b59..deb95198978 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3543,8 +3543,10 @@ usage: (format STRING &rest OBJECTS) */) precision[n+1] = 10 * precision[n+1] + *format - '0'; } - if (format - this_format_start + 1 > longest_format) - longest_format = format - this_format_start + 1; + /* Extra +1 for 'l' that we may need to insert into the + format. */ + if (format - this_format_start + 2 > longest_format) + longest_format = format - this_format_start + 2; if (format == end) error ("Format string ends in middle of format specifier"); From 023843b23be2d285d7ccce4411bdded310c65155 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 16 Nov 2007 00:10:45 +0000 Subject: [PATCH 40/65] (Fformat): When formatting an integer as float take precision into account. --- src/ChangeLog | 1 + src/editfns.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c6c2db23f12..96b0d5f5e3f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2007-11-15 Andreas Schwab * editfns.c (Fformat): Correctly format EMACS_INT values. + When formatting an integer as float take precision into account. 2007-11-15 Juanma Barranquero diff --git a/src/editfns.c b/src/editfns.c index deb95198978..c4b8aa073d3 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3596,18 +3596,23 @@ usage: (format STRING &rest OBJECTS) */) /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ else if (INTEGERP (args[n]) && *format != 's') { + thissize = 30; + /* The following loop assumes the Lisp type indicates the proper way to pass the argument. So make sure we have a flonum if the argument should be a double. */ if (*format == 'e' || *format == 'f' || *format == 'g') - args[n] = Ffloat (args[n]); + { + args[n] = Ffloat (args[n]); + if (precision[n] > 0) + thissize += precision[n]; + } else if (*format != 'd' && *format != 'o' && *format != 'x' && *format != 'i' && *format != 'X' && *format != 'c') error ("Invalid format operation %%%c", *format); - thissize = 30; if (*format == 'c') { if (! SINGLE_BYTE_CHAR_P (XINT (args[n])) From 791e6ff67d2d04940e1771d98bfe044821ccf31c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 16 Nov 2007 00:18:16 +0000 Subject: [PATCH 41/65] Always take precision into account. --- src/editfns.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/editfns.c b/src/editfns.c index c4b8aa073d3..06fb1413b02 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3596,8 +3596,6 @@ usage: (format STRING &rest OBJECTS) */) /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ else if (INTEGERP (args[n]) && *format != 's') { - thissize = 30; - /* The following loop assumes the Lisp type indicates the proper way to pass the argument. So make sure we have a flonum if the argument should @@ -3613,6 +3611,7 @@ usage: (format STRING &rest OBJECTS) */) && *format != 'i' && *format != 'X' && *format != 'c') error ("Invalid format operation %%%c", *format); + thissize = 30 + (precision[n] > 0 ? precision[n] : 0); if (*format == 'c') { if (! SINGLE_BYTE_CHAR_P (XINT (args[n])) From 6af41c87dfc91b3cc980467b074e5efed3998ed5 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 16 Nov 2007 00:19:41 +0000 Subject: [PATCH 42/65] *** empty log message *** --- src/ChangeLog | 4 ++-- src/editfns.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 96b0d5f5e3f..e620d1e9e9e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ 2007-11-15 Andreas Schwab - * editfns.c (Fformat): Correctly format EMACS_INT values. - When formatting an integer as float take precision into account. + * editfns.c (Fformat): Correctly format EMACS_INT values. Also + take precision into account when formatting an integer. 2007-11-15 Juanma Barranquero diff --git a/src/editfns.c b/src/editfns.c index 06fb1413b02..bcfe5756034 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3601,11 +3601,7 @@ usage: (format STRING &rest OBJECTS) */) So make sure we have a flonum if the argument should be a double. */ if (*format == 'e' || *format == 'f' || *format == 'g') - { - args[n] = Ffloat (args[n]); - if (precision[n] > 0) - thissize += precision[n]; - } + args[n] = Ffloat (args[n]); else if (*format != 'd' && *format != 'o' && *format != 'x' && *format != 'i' && *format != 'X' && *format != 'c') From bab6f293f73560ee6147bd474dd1997d982e9292 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 16 Nov 2007 01:28:02 +0000 Subject: [PATCH 43/65] (Man-heading-regexp): Add 0-9. (Man-first-heading-regexp): Remove leading space [ \t]* before NAME. --- lisp/ChangeLog | 5 +++++ lisp/man.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a45abc3e3ac..7ca055fb9cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-16 Juri Linkov + + * man.el (Man-heading-regexp): Add 0-9. + (Man-first-heading-regexp): Remove leading space [ \t]* before NAME. + 2007-11-15 Juanma Barranquero * progmodes/cc-engine.el (c-crosses-statement-barrier-p): diff --git a/lisp/man.el b/lisp/man.el index fc84f327271..4056ddedb29 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -264,14 +264,17 @@ the associated section number." "(\\(" Man-section-regexp "\\))\\).*\\1")) "Regular expression describing the heading of a page.") -(defvar Man-heading-regexp "^\\([A-Z][A-Z /-]+\\)$" +(defvar Man-heading-regexp "^\\([A-Z][A-Z0-9 /-]+\\)$" "Regular expression describing a manpage heading entry.") (defvar Man-see-also-regexp "SEE ALSO" "Regular expression for SEE ALSO heading (or your equivalent). This regexp should not start with a `^' character.") -(defvar Man-first-heading-regexp "^[ \t]*NAME$\\|^[ \t]*No manual entry fo.*$" +;; This used to have leading space [ \t]*, but was removed because it +;; causes false page splits on an occasional NAME with leading space +;; inside a manpage. And `Man-heading-regexp' doesn't have [ \t]* anyway. +(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry fo.*$" "Regular expression describing first heading on a manpage. This regular expression should start with a `^' character.") From 5580cd5187e2e921575541f7a3a3a84ec517b7ab Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 16 Nov 2007 01:28:43 +0000 Subject: [PATCH 44/65] Remove Man reading problem. --- admin/FOR-RELEASE | 2 -- 1 file changed, 2 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index bff2a01ef20..77e9b8d42ed 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -52,8 +52,6 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html ** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect -** e.fennema@tiscali.nl, 9 Nov: Man reading problem - ** Stephen.Berman@gmx.net: minibuffer and current-local-map ** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround From cc39740b6e28432c3bc4a2b61d04a411ce3b41ed Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 16 Nov 2007 03:16:32 +0000 Subject: [PATCH 45/65] (cvs-parse-table): Ignore errors when looking up files in order to determine if there's a conflict. --- lisp/ChangeLog | 9 +++++++-- lisp/pcvs-parse.el | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ca055fb9cf..86f0e839801 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-16 Stefan Monnier + + * pcvs-parse.el (cvs-parse-table): Ignore errors when looking up files + in order to determine if there's a conflict. + 2007-11-16 Juri Linkov * man.el (Man-heading-regexp): Add 0-9. @@ -30,8 +35,8 @@ 2007-11-14 Jason Rumney - * international/mule-cmds.el (set-locale-environment): Set - default-file-name-coding-system from system defaults on Windows. + * international/mule-cmds.el (set-locale-environment): + Set default-file-name-coding-system from system defaults on Windows. 2007-11-14 Nick Roberts diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 3ca1829030f..7eb5c0b488f 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -235,7 +235,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; servers, this should not be necessary, because they return ;; a complete merge output. (with-temp-buffer - (insert-file-contents path) + (ignore-errors (insert-file-contents path)) (goto-char (point-min)) (if (re-search-forward "^<<<<<<< " nil t) 'CONFLICT 'NEED-MERGE)))) @@ -272,8 +272,9 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; branches, or because it's been removed). (if (ignore-errors (with-temp-buffer - (insert-file-contents (expand-file-name - ".cvsignore" (file-name-directory dir))) + (ignore-errors + (insert-file-contents + (expand-file-name ".cvsignore" (file-name-directory dir)))) (goto-char (point-min)) (re-search-forward (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$") From 4dc2bd4d48e55856dc1e3bea9f1d04b8ed352f5d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 16 Nov 2007 03:18:49 +0000 Subject: [PATCH 46/65] (tpu-next-line, tpu-previous-line, tpu-forward-line, tpu-backward-line) (tpu-scroll-window-down, tpu-scroll-window-up): Replace next-line-internal -> line-move. --- lisp/ChangeLog | 6 ++++++ lisp/emulation/tpu-extras.el | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86f0e839801..f477280f565 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-11-16 Rob Riepel + + * emulation/tpu-extras.el (tpu-next-line, tpu-previous-line) + (tpu-forward-line, tpu-backward-line, tpu-scroll-window-down) + (tpu-scroll-window-up): Replace next-line-internal -> line-move. + 2007-11-16 Stefan Monnier * pcvs-parse.el (cvs-parse-table): Ignore errors when looking up files diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el index 609ce2e203b..a98a5ea56b4 100644 --- a/lisp/emulation/tpu-extras.el +++ b/lisp/emulation/tpu-extras.el @@ -196,7 +196,7 @@ Prefix argument serves as a repeat count." (interactive "p") (let ((beg (tpu-current-line))) (if tpu-cursor-free (or (eobp) (picture-move-down num)) - (next-line-internal num)) + (line-move num)) (tpu-bottom-check beg num) (setq this-command 'next-line))) @@ -205,7 +205,7 @@ Prefix argument serves as a repeat count." Prefix argument serves as a repeat count." (interactive "p") (let ((beg (tpu-current-line))) - (if tpu-cursor-free (picture-move-up num) (next-line-internal (- num))) + (if tpu-cursor-free (picture-move-up num) (line-move (- num))) (tpu-top-check beg num) (setq this-command 'previous-line))) @@ -256,7 +256,7 @@ Accepts a prefix argument for the number of lines to move." Prefix argument serves as a repeat count." (interactive "p") (let ((beg (tpu-current-line))) - (next-line-internal num) + (line-move num) (tpu-bottom-check beg num) (beginning-of-line))) @@ -266,7 +266,7 @@ Prefix argument serves as repeat count." (interactive "p") (let ((beg (tpu-current-line))) (or (bolp) (>= 0 num) (setq num (- num 1))) - (next-line-internal (- num)) + (line-move (- num)) (tpu-top-check beg num) (beginning-of-line))) @@ -346,7 +346,7 @@ A repeat count means scroll that many sections." (let* ((beg (tpu-current-line)) (height (1- (window-height))) (lines (* num (/ (* height tpu-percent-scroll) 100)))) - (next-line-internal (- lines)) + (line-move (- lines)) (tpu-top-check beg lines))) (defun tpu-scroll-window-up (num) @@ -356,7 +356,7 @@ A repeat count means scroll that many sections." (let* ((beg (tpu-current-line)) (height (1- (window-height))) (lines (* num (/ (* height tpu-percent-scroll) 100)))) - (next-line-internal lines) + (line-move lines) (tpu-bottom-check beg lines))) From 98ede5d48a06c63c36061ea690be687bbafaf868 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 Nov 2007 07:54:30 +0000 Subject: [PATCH 47/65] (mail-extr-all-top-level-domains): Update domains. --- lisp/ChangeLog | 4 ++++ lisp/mail/mail-extr.el | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f477280f565..99d7b8bcc49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-11-16 Glenn Morris + + * mail/mail-extr.el (mail-extr-all-top-level-domains): Update domains. + 2007-11-16 Rob Riepel * emulation/tpu-extras.el (tpu-next-line, tpu-previous-line) diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index 94a95cd54e5..72433f892bb 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1854,7 +1854,7 @@ place. It affects how `mail-extract-address-components' works." ;; http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1-semic.txt ;; http://www.iana.org/domain-names.htm ;; http://www.iana.org/cctld/cctld-whois.htm -;; Latest change: Mon Jul 8 14:21:59 CEST 2002 +;; Latest change: 2007/11/15 (defconst mail-extr-all-top-level-domains (let ((ob (make-vector 739 0))) @@ -1867,6 +1867,7 @@ place. It affects how `mail-extract-address-components' works." (nth 1 x)))) '( ;; ISO 3166 codes: + ("ac" "Ascension Island") ("ad" "Andorra") ("ae" "United Arab Emirates") ("af" "Afghanistan") @@ -1882,6 +1883,7 @@ place. It affects how `mail-extract-address-components' works." ("at" "Austria" "The Republic of %s") ("au" "Australia") ("aw" "Aruba") + ("ax" "Aland Islands") ("az" "Azerbaijan") ("ba" "Bosnia-Herzegovina") ("bb" "Barbados") @@ -1892,6 +1894,7 @@ place. It affects how `mail-extract-address-components' works." ("bh" "Bahrain") ("bi" "Burundi") ("bj" "Benin") + ("bl" "Saint Barthelemy") ("bm" "Bermuda") ("bn" "Brunei Darussalam") ("bo" "Bolivia" "Republic of %s") @@ -1933,6 +1936,7 @@ place. It affects how `mail-extract-address-components' works." ("er" "Eritrea") ("es" "Spain" "The Kingdom of %s") ("et" "Ethiopia") + ("eu" "European Union") ("fi" "Finland" "The Republic of %s") ("fj" "Fiji") ("fk" "Falkland Islands (Malvinas)") @@ -1944,6 +1948,7 @@ place. It affects how `mail-extract-address-components' works." ("gd" "Grenada") ("ge" "Georgia") ("gf" "French Guiana") + ("gg" "Guernsey") ("gh" "Ghana") ("gi" "Gibraltar") ("gl" "Greenland") @@ -1973,6 +1978,7 @@ place. It affects how `mail-extract-address-components' works." ("ir" "Iran" "Islamic Republic of %s") ("is" "Iceland" "The Republic of %s") ("it" "Italy" "The Italian Republic") + ("je" "Jersey") ("jm" "Jamaica") ("jo" "Jordan") ("jp" "Japan") @@ -2001,6 +2007,8 @@ place. It affects how `mail-extract-address-components' works." ("ma" "Morocco") ("mc" "Monaco") ("md" "Moldova" "The Republic of %s") + ("me" "Montenegro") + ("mf" "Saint Martin (French part)") ("mg" "Madagascar") ("mh" "Marshall Islands") ("mk" "Macedonia" "The Former Yugoslav Republic of %s") @@ -2049,6 +2057,7 @@ place. It affects how `mail-extract-address-components' works." ("qa" "Qatar") ("re" "Reunion (Fr.)") ; In .fr domain ("ro" "Romania") + ("rs" "Serbia") ("ru" "Russia" "Russian Federation") ("rw" "Rwanda") ("sa" "Saudi Arabia") @@ -2112,15 +2121,21 @@ place. It affects how `mail-extract-address-components' works." ("zw" "Zimbabwe" "Republic of %s") ;; Generic Domains: ("aero" t "Air Transport Industry") + ("asia" t "Pan-Asia and Asia Pacific community") ("biz" t "Businesses") + ("cat" t "Catalan language and culture") ("com" t "Commercial") ("coop" t "Cooperative Associations") ("info" t "Info") + ("jobs" t "Employment") + ("mobi" t "Mobile products") ("museum" t "Museums") ("name" t "Individuals") ("net" t "Network") ("org" t "Non-profit Organization") - ;;("pro" t "Credentialed professionals") + ("pro" t "Credentialed professionals") + ("tel" t "Contact data") + ("travel" t "Travel industry") ;;("bitnet" t "Because It's Time NET") ("gov" t "United States Government") ("edu" t "Educational") From 170938d6b1435a3a6567999679a061e876dcef6d Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 16 Nov 2007 10:35:16 +0000 Subject: [PATCH 48/65] (make-variable-frame-local): Fix typo in obsolescence declaration. --- lisp/subr.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/subr.el b/lisp/subr.el index ee9a79c2428..dbf42f9a2ed 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -944,7 +944,7 @@ is converted into a string by expressing it in decimal." (make-obsolete 'focus-frame "it does nothing." "22.1") (defalias 'unfocus-frame 'ignore "") (make-obsolete 'unfocus-frame "it does nothing." "22.1") -(make-obsolete 'make-variable-frame-local "use a frame-parameter instead" "22.2") +(make-obsolete 'make-variable-frame-local "use a frame-parameter instead." "22.2") ;;;; Obsolescence declarations for variables, and aliases. From a4f4cc7ef35dd0249ace8a87557570317cad933c Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 16 Nov 2007 11:03:32 +0000 Subject: [PATCH 49/65] *** empty log message *** --- lisp/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99d7b8bcc49..1793d7963e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-16 Juanma Barranquero + + * subr.el (make-variable-frame-local): + Fix typo in obsolescence declaration. + 2007-11-16 Glenn Morris * mail/mail-extr.el (mail-extr-all-top-level-domains): Update domains. From cca246708aab7e48c28ceb31d54f3da0317b91dc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 16 Nov 2007 16:05:53 +0000 Subject: [PATCH 50/65] (rmail-current-subject-regexp): Allow more than one space after "Subject:". --- lisp/ChangeLog | 5 +++++ lisp/mail/rmail.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1793d7963e9..fca25ad829b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-16 Eli Zaretskii + + * mail/rmail.el (rmail-current-subject-regexp): Allow more than + one space after "Subject:". + 2007-11-16 Juanma Barranquero * subr.el (make-variable-frame-local): diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 30731c2bea9..0dd65f5191a 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3281,7 +3281,9 @@ and more whitespace. The returned regular expressions contains (setq subject (regexp-quote subject)) (setq subject (replace-regexp-in-string "[ \t\n]+" "[ \t\n]+" subject t t)) - (concat "^Subject: " + ;; Some mailers insert extra spaces after "Subject:", so allow any + ;; amount of them. + (concat "^Subject:[ \t]+" (if (string= "\\`" (substring rmail-reply-regexp 0 2)) (substring rmail-reply-regexp 2) rmail-reply-regexp) From 59938af3338f4b06cdf036d34c26b42e014665e4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 16 Nov 2007 18:23:20 +0000 Subject: [PATCH 51/65] (set-locale-environment): Set default-file-name-coding-system _after_ keyboard and terminal coding systems. This fixes last change. --- lisp/ChangeLog | 4 ++++ lisp/international/mule-cmds.el | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fca25ad829b..ef27cfa60e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2007-11-16 Eli Zaretskii + * international/mule-cmds.el (set-locale-environment): Set + default-file-name-coding-system _after_ keyboard and terminal + coding systems. This fixes last change. + * mail/rmail.el (rmail-current-subject-regexp): Allow more than one space after "Subject:". diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index bd2d03eb5d4..6dd1bf07213 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2615,9 +2615,18 @@ See also `locale-charset-language-names', `locale-language-names', (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) (setq locale-coding-system code-page-coding) - (setq default-file-name-coding-system code-page-coding) (set-keyboard-coding-system code-page-coding) - (set-terminal-coding-system code-page-coding)))) + (set-terminal-coding-system code-page-coding) + ;; Set default-file-name-coding-system last, so that Emacs + ;; doesn't try to use cpNNNN when it defines keyboard and + ;; terminal encoding. That's because the above two lines + ;; will want to load code-pages.el, where cpNNNN are + ;; defined; if default-file-name-coding-system were set to + ;; cpNNNN while these two lines run, Emacs will want to use + ;; it for encoding the file name it wants to load. And that + ;; will fail, since cpNNNN is not yet usable until + ;; code-pages.el finishes loading. + (setq default-file-name-coding-system code-page-coding)))) (when (eq system-type 'darwin) ;; On Darwin, file names are always encoded in utf-8, no matter From b51d6c92fd5567e37d43f4ccd9a575c48d9ebbb3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 16 Nov 2007 22:16:01 +0000 Subject: [PATCH 52/65] (Fset_match_data): Remove the `evaporate' feature. (unwind_set_match_data): Don't use the `evaporate' feature. --- src/ChangeLog | 9 +++++++-- src/search.c | 28 +++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e620d1e9e9e..0fb4f189fb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,12 @@ +2007-11-16 Stefan Monnier + + * search.c (Fset_match_data): Remove the `evaporate' feature. + (unwind_set_match_data): Don't use the `evaporate' feature. + 2007-11-15 Andreas Schwab - * editfns.c (Fformat): Correctly format EMACS_INT values. Also - take precision into account when formatting an integer. + * editfns.c (Fformat): Correctly format EMACS_INT values. + Also take precision into account when formatting an integer. 2007-11-15 Juanma Barranquero diff --git a/src/search.c b/src/search.c index 3a9fabeb3ce..ad4fbc45469 100644 --- a/src/search.c +++ b/src/search.c @@ -2892,11 +2892,15 @@ Return value is undefined if the last search failed. */) return reuse; } -/* Internal usage only: - If RESEAT is `evaporate', put the markers back on the free list - immediately. No other references to the markers must exist in this case, - so it is used only internally on the unwind stack and save-match-data from - Lisp. */ +/* We used to have an internal use variant of `reseat' described as: + + If RESEAT is `evaporate', put the markers back on the free list + immediately. No other references to the markers must exist in this + case, so it is used only internally on the unwind stack and + save-match-data from Lisp. + + But it was ill-conceived: those supposedly-internal markers get exposed via + the undo-list, so freeing them here is unsafe. */ DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0, doc: /* Set internal data on last search match from elements of LIST. @@ -2981,10 +2985,7 @@ If optional arg RESEAT is non-nil, make markers on LIST point nowhere. */) if (!NILP (reseat) && MARKERP (m)) { - if (EQ (reseat, Qevaporate)) - free_marker (m); - else - unchain_marker (XMARKER (m)); + unchain_marker (XMARKER (m)); XSETCAR (list, Qnil); } @@ -3002,10 +3003,7 @@ If optional arg RESEAT is non-nil, make markers on LIST point nowhere. */) if (!NILP (reseat) && MARKERP (m)) { - if (EQ (reseat, Qevaporate)) - free_marker (m); - else - unchain_marker (XMARKER (m)); + unchain_marker (XMARKER (m)); XSETCAR (list, Qnil); } } @@ -3069,8 +3067,8 @@ static Lisp_Object unwind_set_match_data (list) Lisp_Object list; { - /* It is safe to free (evaporate) the markers immediately. */ - return Fset_match_data (list, Qevaporate); + /* It is NOT ALWAYS safe to free (evaporate) the markers immediately. */ + return Fset_match_data (list, Qt); } /* Called to unwind protect the match data. */ From d169ccbd0ba2f8e4f470598d9a6ef989d174999a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 17 Nov 2007 11:16:40 +0000 Subject: [PATCH 53/65] Provide exact information about customizing Alt-Shift on Windows XP. --- etc/PROBLEMS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index df2959dc93a..d8821575864 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2216,7 +2216,11 @@ This combination of keys is a command to change keyboard layout. If you proceed to type another non-modifier key before you let go of Alt and Shift, the Alt and Shift act as modifiers in the usual way. A more permanent work around is to change it to another key combination, -or disable it in the keyboard control panel. +or disable it in the "Regional and Language Options" applet of the +Control Panel. (The exact sequence of mouse clicks in the "Regional +and Language Options" applet needed to find the key combination that +changes the keyboard layout depends on your Windows version; for XP, +in the Languages tab, click "Details" and then "Key Settings".) ** Cygwin build of Emacs hangs after rebasing Cygwin DLLs From 7157ea85b31cd7d1d460596dcb86bdc6c20a2736 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Mon, 19 Nov 2007 07:24:21 +0000 Subject: [PATCH 54/65] *** empty log message *** --- lisp/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef27cfa60e4..a9e17310ac0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-11-19 Nick Roberts + + * progmodes/gdb-ui.el: Update commentary. + 2007-11-16 Eli Zaretskii * international/mule-cmds.el (set-locale-environment): Set From 1030a7b3f86fe3b4dbe4f6d30bd0dc7a8ccb33c8 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Mon, 19 Nov 2007 07:26:01 +0000 Subject: [PATCH 55/65] Update commentary. --- lisp/progmodes/gdb-ui.el | 41 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 4100fceb057..37758fc4441 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -43,12 +43,22 @@ ;; section in the GDB info manual. ;; GDB developers plan to make the annotation interface obsolete. A new -;; interface called GDB/MI (machine interface) has been designed to replace -;; it. Some GDB/MI commands are used in this file through the CLI command -;; 'interpreter mi '. A file called gdb-mi.el is included with -;; GDB (6.2 onwards) that uses GDB/MI as the primary interface to GDB. It is -;; still under development and is part of a process to migrate Emacs from -;; annotations to GDB/MI. +;; interface called GDB/MI (machine interface) has been designed to replace it. +;; Some GDB/MI commands are used in this file through the CLI command +;; 'interpreter mi '. To help with the process of fully migrating +;; Emacs from annotations to GDB/MI, there is an experimental package called +;; gdb-mi in the Emacs Lisp Package Archive ("http://tromey.com/elpa/"). It +;; comprises of modified gud.el and a file called gdb-mi.el which replaces +;; gdb-ui.el. When installed, this overrides the current files and invoking +;; M-x gdb will use GDB/MI directly (starts with "gdb -i=mi"). When deleted +;; ('d' followed by 'x' in Package Menu mode), the files are deleted and old +;; functionality restored. This provides a convenient way to review the +;; current status/contribute to its improvement. For someone who just wants to +;; use GDB, however, the current mode in Emacs 22 is a much better option. +;; There is also a file, also called gdb-mi.el, a version of which is included +;; the GDB distribution. This will probably only work with versions +;; distributed with GDB 6.5 or later. Unlike the version in ELPA it works on +;; top of gdb-ui.el and you can only start it with M-x gdbmi. ;; This mode SHOULD WORK WITH GDB 5.0 or later but you will NEED AT LEAST ;; GDB 6.0 to use watch expressions. It works best with GDB 6.4 or later @@ -69,25 +79,13 @@ ;;; Known Bugs: -;; 1) Strings that are watched don't update in the speedbar when their -;; contents change unless the first character changes. -;; 2) Cannot handle multiple debug sessions. -;; 3) M-x gdb doesn't work with "run" command in .gdbinit, use M-x gdba instead. -;; 4) M-x gdb doesn't work if the corefile is specified in the command in the -;; minibuffer, use M-x gdba instead (or specify the core in the GUD buffer). -;; 5) If you wish to call procedures from your program in GDB +;; 1) Cannot handle multiple debug sessions. +;; 2) If you wish to call procedures from your program in GDB ;; e.g "call myproc ()", "p mysquare (5)" then use level 2 annotations ;; "gdb --annotate=2 myprog" to keep source buffer/selected frame fixed. -;; 6) After detaching from a process, clicking on the "GO" icon on toolbar +;; 3) After detaching from a process, clicking on the "GO" icon on toolbar ;; (gud-go) sends "continue" to GDB (should be "run"). -;;; Problems with watch expressions, GDB/MI: - -;; 1) They go out of scope when the inferior is re-run. -;; 2) -stack-list-locals has a type field but also prints type in values field. -;; 3) VARNUM increments even when variable object is not created -;; (maybe trivial). - ;;; TODO: ;; 1) Use MI command -data-read-memory for memory window. @@ -223,7 +221,6 @@ handlers.") The directory containing FILE becomes the initial working directory and source-file directory for your debugger. - If `gdb-many-windows' is nil (the default value) then gdb just pops up the GUD buffer unless `gdb-show-main' is t. In this case it starts with two windows: one displaying the GUD buffer and the From 5f42a7eba296b36aa62f9a6019928fd313020ec3 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 19 Nov 2007 09:14:38 +0000 Subject: [PATCH 56/65] (w32_init_bdf_font, w32_BDF_to_x_font): CreateFileMapping returns NULL on failure. --- src/ChangeLog | 5 +++++ src/w32bdf.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0fb4f189fb9..5d3fdf4b9af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-11-19 Jason Rumney + + * w32bdf.c (w32_init_bdf_font, w32_BDF_to_x_font): CreateFileMapping + returns NULL on failure. + 2007-11-16 Stefan Monnier * search.c (Fset_match_data): Remove the `evaporate' feature. diff --git a/src/w32bdf.c b/src/w32bdf.c index 80ef098d8de..4a12b1f0190 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -261,7 +261,7 @@ w32_init_bdf_font(char *filename) error("Fail to open BDF file"); } hfilemap = CreateFileMapping(hfile, NULL, PAGE_READONLY, 0, 0, NULL); - if (hfilemap == INVALID_HANDLE_VALUE) + if (!hfilemap) { CloseHandle(hfile); error("Can't map font"); @@ -828,7 +828,7 @@ int w32_BDF_to_x_font (char *file, char* xstr, int len) size = fileinfo.nFileSizeLow; hfilemap = CreateFileMapping (hfile, NULL, PAGE_READONLY, 0, 0, NULL); - if (hfilemap == INVALID_HANDLE_VALUE) + if (!hfilemap) { CloseHandle (hfile); return 0; From 0ae03f1a0953f0036146c95167cf83c4facfed7c Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 19 Nov 2007 12:47:03 +0000 Subject: [PATCH 57/65] (map-query-replace-regexp): Doc fix (revert part of 2000-05-21T17:04:47Z!fx@gnu.org made with no ChangeLog entry). --- lisp/replace.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lisp/replace.el b/lisp/replace.el index 8d8d9fc7af5..ebee65b2f40 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -366,11 +366,9 @@ using `search-forward-regexp' and `replace-match' is preferred." "22.1") (defun map-query-replace-regexp (regexp to-strings &optional n start end) "Replace some matches for REGEXP with various strings, in rotation. -The second argument TO-STRINGS contains the replacement strings, -separated by spaces. Third arg DELIMITED (prefix arg if interactive), -if non-nil, means replace only matches surrounded by word boundaries. -This command works like `query-replace-regexp' except that each -successive replacement uses the next successive replacement string, +The second argument TO-STRINGS contains the replacement strings, separated +by spaces. This command works like `query-replace-regexp' except that +each successive replacement uses the next successive replacement string, wrapping around from the last such string to the first. In Transient Mark mode, if the mark is active, operate on the contents From 2beb63c89401b5d596da2ab0246883cd9ccb07cc Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 19 Nov 2007 13:01:14 +0000 Subject: [PATCH 58/65] *** empty log message *** --- lisp/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a9e17310ac0..e2ad4066d02 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-19 Juanma Barranquero + + * replace.el (map-query-replace-regexp): Doc fix (revert part of + 2000-05-21T17:04:47Z!fx@gnu.org made on 2000-05-21 with no ChangeLog entry). + 2007-11-19 Nick Roberts * progmodes/gdb-ui.el: Update commentary. From 5080af45b492f281f6a9b02b4caad90f7277d04e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 20 Nov 2007 04:04:37 +0000 Subject: [PATCH 59/65] *** empty log message *** --- lisp/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2ad4066d02..f2322ae4d24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-20 Glenn Morris + + * emacs-lisp/byte-run.el (declare-function): Define as a no-op, + for compatibility with Emacs 23. + 2007-11-19 Juanma Barranquero * replace.el (map-query-replace-regexp): Doc fix (revert part of From 7a6e37202cf8c766d90ba1b06c829ae2810abdbd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 20 Nov 2007 04:05:18 +0000 Subject: [PATCH 60/65] (declare-function): Define as a no-op, for compatibility with Emacs 23. --- lisp/emacs-lisp/byte-run.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 267173c1713..d38641e7e4a 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -103,6 +103,11 @@ The return value of this function is not used." (eval-and-compile (put ',name 'byte-optimizer 'byte-compile-inline-expand)))) +(defalias 'declare-function 'ignore + "In Emacs 22, does nothing. In 23, it will suppress byte-compiler warnings. +This definition is so that packages may take advantage of the +Emacs 23 feature and still remain compatible with Emacs 22.") + (defun make-obsolete (obsolete-name current-name &optional when) "Make the byte-compiler warn that OBSOLETE-NAME is obsolete. The warning will say that CURRENT-NAME should be used instead. From b1dfec553a2be7e1bd027a9f7abdf328bcc379cb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 20 Nov 2007 12:38:26 +0000 Subject: [PATCH 61/65] Comment change. --- lisp/emacs-lisp/byte-opt.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 6f653c8fc6e..ebe490fb229 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -276,6 +276,8 @@ ;; Isn't it an error for `string' not to be unibyte?? --stef (if (fboundp 'string-as-unibyte) (setq string (string-as-unibyte string))) + ;; `byte-compile-splice-in-already-compiled-code' + ;; takes care of inlining the body. (cons `(lambda ,(aref fn 0) (byte-code ,string ,(aref fn 2) ,(aref fn 3))) (cdr form))) From 5ef5ef3febd0a508a9fd0ea8bfc916803fc6bac6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 20 Nov 2007 12:39:52 +0000 Subject: [PATCH 62/65] (Example -- Configuring a tool called directly): Update example. --- man/ChangeLog | 5 +++++ man/flymake.texi | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/man/ChangeLog b/man/ChangeLog index 955ce866033..88b4087d6ca 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2007-11-18 Richard Stallman + + * flymake.texi (Example -- Configuring a tool called directly): + Update example. + 2007-11-15 Juanma Barranquero * cc-mode.texi (Electric Keys, Custom Macros): Fix typos. diff --git a/man/flymake.texi b/man/flymake.texi index 340a1d164fd..b5ad634c803 100644 --- a/man/flymake.texi +++ b/man/flymake.texi @@ -413,12 +413,9 @@ First, we write the @code{init-function}: (defun flymake-perl-init () (let* ((temp-file (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)) - (local-file (concat (flymake-build-relative-filename - (file-name-directory - (buffer-file-name - (current-buffer))) - (file-name-directory temp-file)) - (file-name-nondirectory temp-file)))) + (local-file (file-relative-name + temp-file + (file-name-directory buffer-file-name)))) (list "perl" (list "-wc " local-file)))) @end lisp From 61ec9e85144dfb30deb0bc23e1bb825c8f387b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Potort=C3=AC?= Date: Tue, 20 Nov 2007 16:17:03 +0000 Subject: [PATCH 63/65] Backporting bug corrections from trunk. --- lib-src/ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 66fa2b91a09..2c22c70f501 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,8 +1,18 @@ +2007-11-15 Francesco Potort,Al(B + + * etags.c: (C_entries): In case '}' decrement bracelev before testing it. + 2007-11-15 Masatake YAMATO * etags.c (C_entries): In case '}', set fvdef to fvnone unconditioned to (!ignoreindent && lp == newlb.buffer + 1). +2007-11-15 Francesco Potort,Al(B + + * etags.c: (C_entries): Reset the fvdef machine when out of function. + (C_entries): Parse start of C comment as a space == end of token. + This is not necessary for C++ comment, already parsed as newline. + 2007-10-26 Juanma Barranquero * emacsclient.c: Add a wrapper for getenv so it also checks the From 37dddac63c5ce29a85c74387c0f959b960e05c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Potort=C3=AC?= Date: Tue, 20 Nov 2007 16:17:40 +0000 Subject: [PATCH 64/65] Backporting bug corrections from trunk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-11-15 Francesco Potort� * etags.c: (C_entries): In case '}' decrement bracelev before testing it. 2007-11-15 Masatake YAMATO * etags.c (C_entries): In case '}', set fvdef to fvnone unconditioned to (!ignoreindent && lp == newlb.buffer + 1). 2007-11-15 Francesco Potort� * etags.c: (C_entries): Reset the fvdef machine when out of function. (C_entries): Parse start of C comment as a space == end of token. This is not necessary for C++ comment, already parsed as newline. --- lib-src/etags.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index 5da144c46b0..47db26a5dd7 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -61,10 +61,10 @@ University of California, as described above. */ /* * Authors: - * Ctags originally by Ken Arnold. - * Fortran added by Jim Kleckner. - * Ed Pelegri-Llopart added C typedefs. - * Gnu Emacs TAGS format and modifications by RMS? + * 1983 Ctags originally by Ken Arnold. + * 1984 Fortran added by Jim Kleckner. + * 1984 Ed Pelegri-Llopart added C typedefs. + * 1985 Emacs TAGS format by Richard Stallman. * 1989 Sam Kendall added C++. * 1992 Joseph B. Wells improved C and C++ parsing. * 1993 Francesco Potortì reorganised C and C++. @@ -876,7 +876,7 @@ etags --help --lang=ada."); # define EMACS_NAME "standalone" #endif #ifndef VERSION -# define VERSION "version" +# define VERSION "17.26" #endif static void print_version () @@ -1468,6 +1468,7 @@ main (argc, argv) exit (EXIT_SUCCESS); } + /* From here on, we are in (CTAGS && !cxref_style) */ if (update) { char cmd[BUFSIZ]; @@ -2976,11 +2977,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) return TRUE; } - /* - * This structdef business is NOT invoked when we are ctags and the - * file is plain C. This is because a struct tag may have the same - * name as another tag, and this loses with ctags. - */ switch (toktype) { case st_C_javastruct: @@ -3398,16 +3394,14 @@ C_entries (c_ext, inf) case '/': if (*lp == '*') { - lp++; incomm = TRUE; - continue; + lp++; + c = ' '; } else if (/* cplpl && */ *lp == '/') { c = '\0'; - break; } - else break; case '%': if ((c_ext & YACC) && *lp == '%') @@ -3950,7 +3944,7 @@ C_entries (c_ext, inf) make_C_tag (FALSE); /* a struct or enum */ break; } - bracelev++; + bracelev += 1; break; case '*': if (definedef != dnone) @@ -3964,17 +3958,21 @@ C_entries (c_ext, inf) case '}': if (definedef != dnone) break; + bracelev -= 1; if (!ignoreindent && lp == newlb.buffer + 1) { if (bracelev != 0) - token.valid = FALSE; + token.valid = FALSE; /* unexpected value, token unreliable */ bracelev = 0; /* reset brace level if first column */ parlev = 0; /* also reset paren level, just in case... */ } - else if (bracelev > 0) - bracelev--; - else + else if (bracelev < 0) + { token.valid = FALSE; /* something gone amiss, token unreliable */ + bracelev = 0; + } + if (bracelev == 0 && fvdef == vignore) + fvdef = fvnone; /* end of function */ popclass_above (bracelev); structdef = snone; /* Only if typdef == tinbody is typdefbracelev significant. */ From 33127d1a78f2a37d68ffa09642df2f38d78e95b1 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 21 Nov 2007 00:32:46 +0000 Subject: [PATCH 65/65] (forward-sentence): Doc fix. Reported by Drew Adams . --- lisp/ChangeLog | 5 +++++ lisp/textmodes/paragraphs.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2322ae4d24..b050d2a5faa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-21 Juanma Barranquero + + * textmodes/paragraphs.el (forward-sentence): Doc fix. + Reported by Drew Adams . + 2007-11-20 Glenn Morris * emacs-lisp/byte-run.el (declare-function): Define as a no-op, diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index 201eeebb623..06ebeea9fa0 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -440,8 +440,8 @@ negative arg -N means kill forward to Nth end of paragraph." (end-of-paragraph-text)))))) (defun forward-sentence (&optional arg) - "Move forward to next `sentence-end'. With argument, repeat. -With negative argument, move backward repeatedly to `sentence-beginning'. + "Move forward to next end of sentence. With argument, repeat. +With negative argument, move backward repeatedly to start of sentence. The variable `sentence-end' is a regular expression that matches ends of sentences. Also, every paragraph boundary terminates sentences as well."