From fdb893e71201a781e2ce5972ca799468d3ade014 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 11 Oct 2010 20:43:52 -0700 Subject: etc/NEWS. --- etc/NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 25236d0f3d2..e1e7ba79d41 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -34,6 +34,11 @@ alt/option key by customizing the value for ns-right-alternate-modifier. ** The appt-add command takes an optional argument for the warning time. This can be used in place of the default appt-message-warning-time. +** Obsolete packages + ++++ +*** lmenu.el and cl-compat.el are now obsolete. + * New Modes and Packages in Emacs 23.3 -- cgit v1.2.1 From 6c3ab469a434395c128dd78741c7a5e2e0a38074 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 11 Oct 2010 20:45:41 -0700 Subject: * BUGS, INSTALL.BZR: Updates. --- BUGS | 31 ++++++++++++++----------------- ChangeLog | 4 ++++ INSTALL.BZR | 14 +++----------- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/BUGS b/BUGS index 32b44ceb0a3..552be81a0f9 100644 --- a/BUGS +++ b/BUGS @@ -1,26 +1,23 @@ -If you think you may have found a bug in GNU Emacs, please -read the Bugs section of the Emacs manual for advice on +If you think you may have found a bug in GNU Emacs, please read the +Bugs section of the Emacs manual for advice on + (1) how to tell when to report a bug, and -(2) how to write a useful bug report and what information -it needs to have. +(2) how to write a useful bug report and what information it needs to have. -There are three ways to read the Bugs section. +You can read the read the Bugs section of the manual from inside Emacs. +Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the +Emacs manual, then m Bugs RET to get to the section on bugs. +Or you can use the standalone Info program in a like manner. +(Standalone Info is part of the Texinfo distribution, not part of the +Emacs distribution.) -(1) In a printed copy of the Emacs manual. -You can order one from the Free Software Foundation; -see the file etc/ORDERS. But if you don't have a copy on -hand and you think you have found a bug, you shouldn't wait -to get a printed manual; you should read the section right away -as described below. +Printed copies of the Emacs manual can be purchased from the Free +Software Foundation's online store at . -(2) With Info. Start Emacs, do C-h i to enter Info, -then m Emacs RET to get to the Emacs manual, then m Bugs RET -to get to the section on bugs. Or use standalone Info in -a like manner. (Standalone Info is part of the Texinfo distribution, -not part of the Emacs distribution.) +If necessary, you can read the manual without an info program: -(3) By hand. Do cat info/emacs* | more "+/^File: emacs, Node: Bugs," + Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to make sure it isn't a known issue. diff --git a/ChangeLog b/ChangeLog index c25b54e853f..43a1dcab822 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Glenn Morris + + * BUGS, INSTALL.BZR: Updates. + 2010-10-08 Eli Zaretskii * make-dist: Don't distribute src/buildobj.h. (Bug#7167) diff --git a/INSTALL.BZR b/INSTALL.BZR index 48fa976c46c..dafd0b81080 100644 --- a/INSTALL.BZR +++ b/INSTALL.BZR @@ -31,13 +31,9 @@ generated files, such as esh-groups.el, and *-loaddefs.el in some subdirectories of lisp/, e.g. mh-e/ and calendar/) will need to be updated to reflect new autoloaded functions. If you see errors (rather than warnings) about undefined lisp functions during compilation, that -may be the reason. Another symptom may be an error saying that -"loaddefs.el" could not be found; this is due to a change in the way -loaddefs.el was handled in version control, and should only happen -once, for users that are updating old sources. Finally, sometimes -there can be build failures related to *loaddefs.el (e.g. "required -feature `esh-groups' was not provided"). In that case, follow the -instructions below. +may be the reason. Finally, sometimes there can be build failures +related to *loaddefs.el (e.g. "required feature `esh-groups' was not +provided"). In that case, follow the instructions below. To update loaddefs.el (and similar files), do: @@ -53,10 +49,6 @@ platform-specific configuration scripts (nt/configure.bat, config.bat, etc.) before "make bootstrap" or "make"; the rest of the procedure is applicable to those systems as well. -Questions, requests, and bug reports about the Bazaar versions of Emacs -should be sent to bug-gnu-emacs@gnu.org rather than gnu.emacs.help. -Ideally, use M-x report-emacs-bug RET. - Because the Bazaar version of Emacs is a work in progress, it will sometimes fail to build. Please wait a day or so (and check the bug and development mailing list archives) before reporting such problems. -- cgit v1.2.1 From 1c8ca3e6d672ad2d413683e85ec8669ca2204955 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 11 Oct 2010 20:47:36 -0700 Subject: * README: Updates. --- ChangeLog | 2 +- README | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43a1dcab822..1c32435237a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2010-10-12 Glenn Morris - * BUGS, INSTALL.BZR: Updates. + * BUGS, INSTALL.BZR, README: Updates. 2010-10-08 Eli Zaretskii diff --git a/README b/README index 7c48684c6dc..088db57f301 100644 --- a/README +++ b/README @@ -65,16 +65,15 @@ There are several subdirectories: which can't be directly produced by your keyboard. `lib-src' holds the source code for some utility programs for use by or with Emacs, like movemail and etags. -`etc' holds miscellaneous architecture-independent data files - Emacs uses, like the tutorial text and the Zippy the Pinhead - quote database. The contents of the `lisp', `leim', `info', - `man', `lispref', and `lispintro' subdirectories are - architecture-independent too. +`etc' holds miscellaneous architecture-independent data files Emacs + uses, like the tutorial text and tool bar images. + The contents of the `lisp', `leim', `info', and `doc' + subdirectories are architecture-independent too. `info' holds the Info documentation tree for Emacs. `doc/emacs' holds the source code for the Emacs Manual. If you modify the manual sources, you will need the `makeinfo' program to produce an updated manual. `makeinfo' is part of the GNU Texinfo - package; you need version 4.6 or later of Texinfo. + package; you need a suitably recent version of Texinfo. `doc/lispref' holds the source code for the Emacs Lisp reference manual. `doc/lispintro' holds the source code for the Introduction to Programming in Emacs Lisp manual. @@ -85,10 +84,9 @@ There are several subdirectories: to building and running Emacs on Windows 9X/ME/NT/2000/XP. `test' holds tests for various aspects of Emacs's functionality. - Building Emacs on non-Posix platforms requires to install tools -that aren't part of the standard distribution of the OS. The -platform-specific README files and installation instructions should -list the required tools. + Building Emacs on non-Posix platforms requires tools that aren't part +of the standard distribution of the OS. The platform-specific README +files and installation instructions should list the required tools. This file is part of GNU Emacs. -- cgit v1.2.1 From ad1746f5db1b4c52da8d7bdc52359d6b0a5a5e24 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 12 Oct 2010 21:52:05 +0900 Subject: Fix typos in comments --- src/coding.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/coding.c b/src/coding.c index 8e6642bb80d..137e72a0ba4 100644 --- a/src/coding.c +++ b/src/coding.c @@ -167,7 +167,7 @@ detect_coding_XXX (coding, detect_info) while (1) { - /* Get one byte from the source. If the souce is exausted, jump + /* Get one byte from the source. If the source is exhausted, jump to no_more_source:. */ ONE_MORE_BYTE (c); @@ -181,7 +181,7 @@ detect_coding_XXX (coding, detect_info) return 0; no_more_source: - /* The source exausted successfully. */ + /* The source exhausted successfully. */ detect_info->found |= found; return 1; } @@ -537,7 +537,7 @@ enum iso_code_class_type on output. */ #define CODING_ISO_FLAG_DESIGNATE_AT_BOL 0x0400 -/* If set, do not encode unsafe charactes on output. */ +/* If set, do not encode unsafe characters on output. */ #define CODING_ISO_FLAG_SAFE 0x0800 /* If set, extra latin codes (128..159) are accepted as a valid code @@ -693,7 +693,7 @@ enum coding_category static Lisp_Object Vcoding_category_list; /* Table of coding categories (Lisp symbols). This variable is for - internal use oly. */ + internal use only. */ static Lisp_Object Vcoding_category_table; /* Table of coding-categories ordered by priority. */ @@ -825,7 +825,7 @@ static struct coding_system coding_categories[coding_category_max]; } while (0) -/* Like EMIT_ONE_ASCII_BYTE byt store two bytes; C1 and C2. */ +/* Like EMIT_ONE_ASCII_BYTE but store two bytes; C1 and C2. */ #define EMIT_TWO_ASCII_BYTES(c1, c2) \ do { \ @@ -1241,7 +1241,7 @@ alloc_destination (coding, nbytes, dst) METHOD is one of enum composition_method. - Optionnal COMPOSITION-COMPONENTS are characters and composition + Optional COMPOSITION-COMPONENTS are characters and composition rules. In the case of CODING_ANNOTATE_CHARSET_MASK, one element CHARSET-ID @@ -1954,7 +1954,7 @@ encode_coding_utf_16 (coding) CHARS is 0xA0 plus a number of characters composed by this data, - COMPONENTs are characters of multibye form or composition + COMPONENTs are characters of multibyte form or composition rules encoded by two-byte of ASCII codes. In addition, for backward compatibility, the following formats are @@ -2455,8 +2455,8 @@ decode_coding_emacs_mule (coding) const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base; int *charbuf = coding->charbuf + coding->charbuf_used; - /* We may produce two annocations (charset and composition) in one - loop and one more charset annocation at the end. */ + /* We may produce two annotations (charset and composition) in one + loop and one more charset annotation at the end. */ int *charbuf_end = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3); int consumed_chars = 0, consumed_chars_base; @@ -2532,7 +2532,7 @@ decode_coding_emacs_mule (coding) /* emacs_mule_char can load a charset map from a file, which allocates a large structure and might cause buffer text to be relocated as result. Thus, we need to remember the - original pointer to buffer text, and fixup all related + original pointer to buffer text, and fix up all related pointers after the call. */ const unsigned char *orig = coding->source; EMACS_INT offset; @@ -2559,7 +2559,7 @@ decode_coding_emacs_mule (coding) cmp_status->ncomps -= nchars; } - /* Now if C >= 0, we found a normally encoded characer, if C < + /* Now if C >= 0, we found a normally encoded character, if C < 0, we found an old-style composition component character or rule. */ @@ -3072,7 +3072,7 @@ setup_iso_safe_charsets (attrs) /* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions". - Check if a text is encoded in one of ISO-2022 based codig systems. + Check if a text is encoded in one of ISO-2022 based coding systems. If it is, return 1, else return 0. */ static int @@ -3484,7 +3484,7 @@ finish_composition (charbuf, cmp_status) return new_chars; } -/* If characers are under composition, finish the composition. */ +/* If characters are under composition, finish the composition. */ #define MAYBE_FINISH_COMPOSITION() \ do { \ if (cmp_status->state != COMPOSING_NO) \ @@ -3591,8 +3591,8 @@ decode_coding_iso_2022 (coding) const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base; int *charbuf = coding->charbuf + coding->charbuf_used; - /* We may produce two annocations (charset and composition) in one - loop and one more charset annocation at the end. */ + /* We may produce two annotations (charset and composition) in one + loop and one more charset annotation at the end. */ int *charbuf_end = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3); int consumed_chars = 0, consumed_chars_base; @@ -3894,7 +3894,7 @@ decode_coding_iso_2022 (coding) goto invalid_code; /* For the moment, nested direction is not supported. So, `coding->mode & CODING_MODE_DIRECTION' zero means - left-to-right, and nozero means right-to-left. */ + left-to-right, and nonzero means right-to-left. */ ONE_MORE_BYTE (c1); switch (c1) { @@ -4807,7 +4807,7 @@ decode_coding_sjis (coding) const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base; int *charbuf = coding->charbuf + coding->charbuf_used; - /* We may produce one charset annocation in one loop and one more at + /* We may produce one charset annotation in one loop and one more at the end. */ int *charbuf_end = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); @@ -4926,7 +4926,7 @@ decode_coding_big5 (coding) const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base; int *charbuf = coding->charbuf + coding->charbuf_used; - /* We may produce one charset annocation in one loop and one more at + /* We may produce one charset annotation in one loop and one more at the end. */ int *charbuf_end = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); @@ -5592,7 +5592,7 @@ decode_coding_charset (coding) const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base; int *charbuf = coding->charbuf + coding->charbuf_used; - /* We may produce one charset annocation in one loop and one more at + /* We may produce one charset annotation in one loop and one more at the end. */ int *charbuf_end = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); @@ -6203,14 +6203,14 @@ complement_process_encoding_system (coding_system) o coding-category-iso-7-else The category for a coding system which has the same code range - as ISO2022 of 7-bit environemnt but uses locking shift or + as ISO2022 of 7-bit environment but uses locking shift or single shift functions. Assigned the coding-system (Lisp symbol) `iso-2022-7bit-lock' by default. o coding-category-iso-8-else The category for a coding system which has the same code range - as ISO2022 of 8-bit environemnt but uses locking shift or + as ISO2022 of 8-bit environment but uses locking shift or single shift functions. Assigned the coding-system (Lisp symbol) `iso-2022-8bit-ss2' by default. @@ -7635,7 +7635,7 @@ static Lisp_Object Vcode_conversion_reused_workbuf; static int reused_workbuf_in_use; -/* Return a working buffer of code convesion. MULTIBYTE specifies the +/* Return a working buffer of code conversion. MULTIBYTE specifies the multibyteness of returning buffer. */ static Lisp_Object @@ -8298,7 +8298,7 @@ function `define-coding-system'. */) /* Detect how the bytes at SRC of length SRC_BYTES are encoded. If HIGHEST is nonzero, return the coding system of the highest - priority among the detected coding systems. Otherwize return a + priority among the detected coding systems. Otherwise return a list of detected coding systems sorted by their priorities. If MULTIBYTEP is nonzero, it is assumed that the bytes are in correct multibyte form but contains only ASCII and eight-bit chars. @@ -9423,7 +9423,7 @@ DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_intern setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding); /* We had better not send unsafe characters to terminal. */ terminal_coding->mode |= CODING_MODE_SAFE_ENCODING; - /* Characer composition should be disabled. */ + /* Character composition should be disabled. */ terminal_coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; terminal_coding->src_multibyte = 1; terminal_coding->dst_multibyte = 0; @@ -9440,7 +9440,7 @@ DEFUN ("set-safe-terminal-coding-system-internal", CHECK_SYMBOL (coding_system); setup_coding_system (Fcheck_coding_system (coding_system), &safe_terminal_coding); - /* Characer composition should be disabled. */ + /* Character composition should be disabled. */ safe_terminal_coding.common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; safe_terminal_coding.src_multibyte = 1; safe_terminal_coding.dst_multibyte = 0; @@ -9477,7 +9477,7 @@ DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_intern else Fcheck_coding_system (coding_system); setup_coding_system (coding_system, TERMINAL_KEYBOARD_CODING (t)); - /* Characer composition should be disabled. */ + /* Character composition should be disabled. */ TERMINAL_KEYBOARD_CODING (t)->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; return Qnil; @@ -9854,7 +9854,7 @@ usage: (define-coding-system-internal ...) */) If Nth element is a list of charset IDs, N is the first byte of one of them. The list is sorted by dimensions of the - charsets. A charset of smaller dimension comes firtst. */ + charsets. A charset of smaller dimension comes first. */ val = Fmake_vector (make_number (256), Qnil); for (tail = charset_list; CONSP (tail); tail = XCDR (tail)) -- cgit v1.2.1 From 51e4f4a88de94846f6b44b3e11496c7b67aa2f5e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 12 Oct 2010 17:16:57 +0200 Subject: Fix typos in docstrings, comments and ChangeLogs. * lisp/composite.el (compose-region): * src/ccl.c (Fccl_execute_on_string): Fix typo in docstring. --- lisp/ChangeLog | 20 ++++++++++++-------- lisp/ChangeLog.7 | 4 ++-- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 12 ++++++------ lisp/composite.el | 2 +- lisp/gnus/ecomplete.el | 2 +- lisp/international/ccl.el | 2 +- lisp/international/fontset.el | 2 +- src/ChangeLog | 4 ++++ src/ChangeLog.7 | 4 ++-- src/ccl.c | 4 ++-- src/dispextern.h | 2 +- src/font.h | 2 +- src/print.c | 2 +- src/regex.c | 2 +- src/w32font.c | 2 +- src/w32uniscribe.c | 2 +- 17 files changed, 39 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3275116a9b..6e922bcacd4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,15 @@ - 2010-10-10 Jan Djärv - - * term/ns-win.el (ns-right-alternate-modifier): New defvar. - (ns-right-option-modifier): New alias for ns-right-alternate-modifier. - (mac-right-option-modifier): New alias for ns-right-option-modifier. - - * cus-start.el (all): ns-right-alternate-modifier is new. - +2010-10-12 Juanma Barranquero + + * composite.el (compose-region): Fix typo in docstring. + +2010-10-10 Jan Djärv + + * term/ns-win.el (ns-right-alternate-modifier): New defvar. + (ns-right-option-modifier): New alias for ns-right-alternate-modifier. + (mac-right-option-modifier): New alias for ns-right-option-modifier. + + * cus-start.el (all): ns-right-alternate-modifier is new. + 2010-10-10 Andreas Schwab * Makefile.in (ELCFILES): Update. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 6858c07d852..cc813b263c0 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -1043,10 +1043,10 @@ (quail-prev-translation-block): Likewise. (quail-conversion-backward-char): Call quail-error instead of error. Set quail-translating to nil. - (quail-conversion-forward-char): Likewize. + (quail-conversion-forward-char): Likewise. (quail-conversion-delete-char): Call quail-error instead of error. If conversion region gets vacant, set quail-converting to nil. - (quail-conversion-backward-delete-char): Likewize. + (quail-conversion-backward-delete-char): Likewise. (quail-no-conversion): Just set quail-converting to nil. (quail-mouse-choose-completion): Call quai-error instead of error. (quail-choose-completion-string): Likewise. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 8ecf3f0e33a..fadec1174c8 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -4926,7 +4926,7 @@ * language/ethio-util.el (setup-ethiopic-environment-internal): Use quail-activate-hook instead of obsolete hook quail-mode-hook. - (exit-ethiopic-environment): Likewize. + (exit-ethiopic-environment): Likewise. 1999-06-12 Richard M. Stallman diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 135eb8edbb3..6250bd0917a 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -16606,7 +16606,7 @@ 0. Give correct argument to set-auto-coding-function. (tar-expunge): For goto-char, use (point-min), not 0. (tar-clear-modification-flags): For goto-char, use (point-min), not 1. - (tar-subfile-save-buffer): Likewize. + (tar-subfile-save-buffer): Likewise. * international/mule.el (after-insert-file-set-buffer-file-coding-system): Call @@ -16910,7 +16910,7 @@ (ccl-decode-viscii): Use translate-character. (ccl-encode-viscii, ccl-encode-viscii-font) (ccl-decode-vscii, ccl-encode-vscii, ccl-encode-vscii-font): - Likewize. + Likewise. * language/cyrillic.el: Remove eval-when-compile. (cyrillic-koi8-r-nonascii-translation-table): Define it as a @@ -16918,14 +16918,14 @@ (cyrillic-koi8-r-encode-table): Define it as a translation table made from the reverse map of above. (ccl-decode-koi8): Use translate-character. - (ccl-encode-koi8, ccl-encode-koi8-font): Likewize + (ccl-encode-koi8, ccl-encode-koi8-font): Likewise. (cyrillic-alternativnyj-nonascii-translation-table): Define it as a translation table made from cyrillic-alternativnyj-decode-table. (cyrillic-alternativnyj-encode-table): Define it as a translation table made from the reverse map of above. (ccl-decode-alternativnyj): Use translate-character. (ccl-encode-alternativnyj, ccl-encode-alternativnyj-font): - Likewize + Likewise. * international/mule-diag.el (non-iso-charset-alist): Specify translation table symbol instead of translation table itself. @@ -18071,8 +18071,8 @@ * emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg list in doc string. Don't quote keyword symbols. - * emacs-lisp/cl.el: Likewise - * emacs-lisp/cl-seq.el: Likewise + * emacs-lisp/cl.el: Likewise. + * emacs-lisp/cl-seq.el: Likewise. 2000-05-05 Gerd Moellmann diff --git a/lisp/composite.el b/lisp/composite.el index 5b01718fc71..b5ef9b510c6 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -210,7 +210,7 @@ of the text in the region. If it is a string, the elements are alternate characters. In this case, TAB element has a special meaning. If the first -characer is TAB, the glyphs are displayed with left padding space +character is TAB, the glyphs are displayed with left padding space so that no pixel overlaps with the previous column. If the last character is TAB, the glyphs are displayed with right padding space so that no pixel overlaps with the following column. diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el index 7952c37f396..7aca7492a6d 100644 --- a/lisp/gnus/ecomplete.el +++ b/lisp/gnus/ecomplete.el @@ -147,7 +147,7 @@ (save-restriction (narrow-to-region (point) (point-at-eol)) (while (not (eobp)) - ;; Put the 'region face on any charactes on this line that + ;; Put the 'region face on any characters on this line that ;; aren't already highlighted. (unless (get-text-property (point) 'face) (put-text-property (point) (1+ (point)) 'face 'highlight)) diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 09510cd8b00..4dc54859ec5 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1437,7 +1437,7 @@ OPERATOR := ;; Normal arithmethic operators (same meaning as C code). + | - | * | / | % - ;; Bitwize operators (same meaning as C code) + ;; Bitwise operators (same meaning as C code) | & | `|' | ^ ;; Shifting operators (same meaning as C code) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index ecb2088de89..1a5823826dd 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -700,7 +700,7 @@ Internal use only. Should be called at startup time." ;; "HP-Hebrew8" [36] ;; HPHEBREW8 8-bit character set ;; "HP-Japanese15" [36] -;; HPJAPAN15 15-bit characer set, +;; HPJAPAN15 15-bit character set, ;; modified from industry defacto ;; standard Shift-JIS ;; "HP-Kana8" [36] diff --git a/src/ChangeLog b/src/ChangeLog index 9ce5007d3b3..01ecd37eec7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero + + * ccl.c (Fccl_execute_on_string): Fix typo in docstring. + 2010-10-10 Jan Djärv * nsterm.m (Qleft): Declare. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 6cc3d0f9e3e..a334b4806da 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -491,7 +491,7 @@ * xselect.c (selection_data_to_lisp_data): Set Vlast_coding_system_used. - (lisp_data_to_selection_data): Likewize. + (lisp_data_to_selection_data): Likesize. 1998-07-07 Richard Stallman @@ -502,7 +502,7 @@ * editfns.c (Fformat): Replace explicit numeric constants with proper macros. - * fns.c (concat): Likewize. + * fns.c (concat): Likewise. 1998-07-06 Kenichi Handa diff --git a/src/ccl.c b/src/ccl.c index c33df9e56de..ac1d7be621c 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -450,7 +450,7 @@ extern int charset_unicode; Therefore, the instruction code range is 0..16384(0x3fff). */ -/* Read a multibyte characeter. +/* Read a multibyte character. A code point is stored into reg[rrr]. A charset ID is stored into reg[RRR]. */ @@ -2058,7 +2058,7 @@ If R0..R7 are nil, they are initialized to 0. If IC is nil, it is initialized to head of the CCL program. If optional 4th arg CONTINUE is non-nil, keep IC on read operation -when read buffer is exausted, else, IC is always set to the end of +when read buffer is exhausted, else, IC is always set to the end of CCL-PROGRAM on exit. It returns the contents of write buffer as a string, diff --git a/src/dispextern.h b/src/dispextern.h index 076d9055859..ca91c5b6812 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1873,7 +1873,7 @@ struct composition_it are not iterating over a composition now. */ int id; /* If non-negative, character that triggers the automatic - composition at `stop_pos', and this is an automatic compositoin. + composition at `stop_pos', and this is an automatic composition. If negative, this is a static composition. This is set to -2 temporarily if searching of composition reach a limit or a newline. */ diff --git a/src/font.h b/src/font.h index 952ea269495..96227ffe40b 100644 --- a/src/font.h +++ b/src/font.h @@ -574,7 +574,7 @@ struct font_driver FONT-ENTITY and it must be opened to check it, return -1. */ int (*has_char) P_ ((Lisp_Object font, int c)); - /* Return a glyph code of FONT for characer C (Unicode code point). + /* Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ unsigned (*encode_char) P_ ((struct font *font, int c)); diff --git a/src/print.c b/src/print.c index ccbf8d8c0c7..43f17a7c15d 100644 --- a/src/print.c +++ b/src/print.c @@ -1450,7 +1450,7 @@ static void print_check_string_charset_prop (); #define PRINT_STRING_NON_CHARSET_FOUND 1 #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 -/* Bitwize or of the abobe macros. */ +/* Bitwise or of the above macros. */ static int print_check_string_result; static void diff --git a/src/regex.c b/src/regex.c index 85ff9b99604..7d12089fea2 100644 --- a/src/regex.c +++ b/src/regex.c @@ -4145,7 +4145,7 @@ analyse_first (p, pend, fastmap, multibyte) && match_any_multibyte_characters == false) { /* Set fastmap[I] to 1 where I is a leading code of each - multibyte characer in the range table. */ + multibyte character in the range table. */ int c, count; unsigned char lc1, lc2; diff --git a/src/w32font.c b/src/w32font.c index e93dbca2ddb..a07762e970f 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -346,7 +346,7 @@ w32font_has_char (entity, c) } /* w32 implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. For speed, the gdi backend uses unicode (Emacs calls encode_char diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index cfdf629ceee..9cd1ac6426c 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -448,7 +448,7 @@ uniscribe_shape (lgstring) } /* Uniscribe implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ static unsigned uniscribe_encode_char (font, c) -- cgit v1.2.1 From c0943d3db2b2737d5092e887fd22d7088c3ca43d Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 13 Oct 2010 01:25:19 +0200 Subject: Fix typos in docstrings, comments and ChangeLogs. * etc/tutorials/TUTORIAL.es: Fix typos. * lisp/cedet/semantic/symref/list.el (semantic-symref-list-rename-open-hits): Fix typo in message. (semantic-symref-list-map-open-hits): Fix typo in docstring. * lisp/erc/erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. * lisp/gnus/nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring. * lisp/international/mule.el (define-coding-system): * lisp/international/titdic-cnv.el (quail-cxterm-package-ext-info): * composite.el (compose-region): Fix typo in docstring. * lisp/org/org-agenda.el (org-prefix-category-length) (org-prefix-category-max-length): Fix typos in docstrings. * src/font.c (Ffont_variation_glyphs): * ccl.c (Fccl_execute_on_string): Fix typo in docstring. --- admin/unidata/unidata-gen.el | 2 +- doc/emacs/ChangeLog | 2 +- etc/ChangeLog | 4 +++ etc/tutorials/TUTORIAL.es | 66 +++++++++++++++++++------------------- lisp/ChangeLog | 6 ++-- lisp/ChangeLog.1 | 18 +++++------ lisp/ChangeLog.12 | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.14 | 2 +- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 34 ++++++++++---------- lisp/cedet/ChangeLog | 10 ++++-- lisp/cedet/ede/base.el | 2 +- lisp/cedet/semantic/symref/list.el | 4 +-- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/erc/ChangeLog | 4 +++ lisp/erc/erc-xdcc.el | 2 +- lisp/gnus/ChangeLog | 4 +++ lisp/gnus/ChangeLog.2 | 22 ++++++------- lisp/gnus/nnmail.el | 2 +- lisp/international/mule.el | 2 +- lisp/international/titdic-cnv.el | 2 +- lisp/ls-lisp.el | 2 +- lisp/man.el | 2 +- lisp/mh-e/ChangeLog.1 | 32 +++++++++--------- lisp/org/ChangeLog | 7 +++- lisp/org/org-agenda.el | 4 +-- lisp/simple.el | 2 +- src/ChangeLog | 9 +++--- src/ChangeLog.2 | 32 +++++++++--------- src/ChangeLog.3 | 8 ++--- src/ChangeLog.5 | 6 ++-- src/ChangeLog.7 | 2 +- src/ChangeLog.8 | 2 +- src/ChangeLog.9 | 16 ++++----- src/font.c | 2 +- src/frame.h | 2 +- src/nsterm.m | 10 +++--- 38 files changed, 180 insertions(+), 154 deletions(-) diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 88e21d7226e..211c6f0a530 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -95,7 +95,7 @@ (with-temp-buffer ;; Insert a file of this format: ;; (CHAR NAME CATEGORY ...) - ;; where CHAR is a charater code, the following elements are strings + ;; where CHAR is a character code, the following elements are strings ;; representing character properties. (insert-file-contents unidata-text-file) (goto-char (point-min)) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 2c47fbe0daf..b5a5c700688 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -147,7 +147,7 @@ * custom.texi (Init Examples): Add xref to Mail Header. - * emacs.texi (Top): Fix xrefs. + * emacs.texi (Top): Fix xrefs. 2010-03-25 Chong Yidong diff --git a/etc/ChangeLog b/etc/ChangeLog index 7bbc06fa4af..ac7ab124656 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero + + * tutorials/TUTORIAL.es: Fix typos. + 2010-09-21 Eric Ludlam * srecode/java.srt: Make NAME be a prompt. diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es index 7fb7ac2c2a3..7b8198a915b 100644 --- a/etc/tutorials/TUTORIAL.es +++ b/etc/tutorials/TUTORIAL.es @@ -1,4 +1,4 @@ -Tutorial de Emacs. Vea al final las condiciones de copiado. +Tutorial de Emacs. Vea al final las condiciones de copiado. Generalmente los comandos de Emacs involucran la tecla CONTROL (algunas veces llamada CTRL O CTL) o la tecla meta (algunas veces @@ -17,7 +17,7 @@ Nota importante: para terminar la sesi caracteres). Los caracteres ">>" en el margen izquierdo indican instrucciones para que usted trate de usar un comando. Por ejemplo: <> -[Mitad de página en blanco para propósitos didácticos. El texto continúa abajo] +[Mitad de página en blanco para propósitos didácticos. El texto continúa abajo] >> Ahora teclee C-v (ver la próxima pantalla) para desplazarse a la siguiente pantalla (hágalo manteniendo la tecla control oprimida mientras teclea v). Desde ahora debería hacer esto @@ -75,7 +75,7 @@ equivalentes a las cuatro teclas de flechas, de esta manera: Línea siguiente, C-n >> Mueva el cursor a la línea en la mitad del diagrama - usando C-n o C-p. Luego teclee C-l para ver el + usando C-n o C-p. Luego teclee C-l para ver el diagrama completo centrado en la pantalla. Le resultará fácil recordar estas letras por las palabras que @@ -200,7 +200,7 @@ manera de pasarle un factor de repetici C-u y luego los dígitos antes de introducir los comandos. Si tiene una tecla META (o EDIT o ALT), hay una manera alternativa para ingresar un argumento numérico: teclear los dígitos mientras presiona -la tecla META. Recomendamos aprender el método C-u porque este +la tecla META. Recomendamos aprender el método C-u porque éste funciona en cualquier terminal. El argumento numérico es también llamado un "argumento prefijo", porque usted teclea el argumento antes del comando al que se aplica. @@ -321,13 +321,13 @@ Puede borrar el es una tecla en el teclado--la misma que normalmente usa fuera de emacs para borrar el último carácter que escribió. Normalmente es una tecla una o dos filas arriba de la tecla , -y que esta usualmente rotulada como "Backspace", "Del" o simplemente +y que está usualmente rotulada como "Backspace", "Del" o simplemente con una flecha en dirección izquierda que no es parte de las teclas de flecha. -Si la tecla larga esta rotulada "Backspace", entonces esa es la que -debe de usar para . Puede haber otra tecla llamada "Del" en -otra parte, pero esa no es . +Si la tecla larga está rotulada "Backspace", entonces ésa es la que +debe de usar para . Puede haber otra tecla llamada "Del" en +otra parte, pero ésa no es . Generalmente, borra el carácter inmediatamente anterior a la posición actual del cursor. @@ -393,7 +393,7 @@ otro extremo de esa parte, y teclee C-w. Eso elimina todo el texto entre las dos posiciones. >> Mueva el cursor a la letra T del inicio del párrafo anterior. ->> Teclee C-SPC. Emacs debe mostrar el mensaje "Mark set" en la parte +>> Teclee C-SPC. Emacs debe mostrar el mensaje "Mark set" en la parte de abajo de la pantalla. >> Mueva el cursor a la x en "extremo", en la segunda línea del párrafo. @@ -405,7 +405,7 @@ puede ser reinsertado, mientras que las cosas "borradas" no pueden ser reinsertadas. La reinserción de texto eliminado se llama "yanking" o "pegar". Generalmente, los comandos que pueden quitar mucho texto lo eliminan, mientras que los comandos que quitan solo un carácter, o -solo lineas en blanco y espacios, borran (para que no pueda pegar ese +solo líneas en blanco y espacios, borran (para que no pueda pegar ese texto). >> Mueva el cursor al comienzo de una línea que no esté vacía. @@ -417,14 +417,14 @@ Note que al teclear C-k una sola vez elimina el contenido de la l y un segundo C-k elimina la línea misma, y hace que todas las otras líneas se muevan hacia arriba. C-k trata un argumento numérico especialmente: Elimina ese número de líneas y TAMBIÉN sus -contenidos. Esto no es una simple repetición. C-u 2 C-k elimina dos +contenidos. Esto no es una simple repetición. C-u 2 C-k elimina dos líneas y sus nuevas líneas, tecleando C-k dos veces no hace esto. Traer texto eliminado de regreso es llamado "yanking" o "pegar". (Piense en ello como pegar de nuevo, o traer de vuelta, algún texto que le fue quitado.) Puede pegar el texto eliminado en, ya sea el lugar en que fue eliminado, o en otra parte del buffer, o hasta en un -archivo diferente. Puede pegar el texto varias veces, lo que hace +archivo diferente. Puede pegar el texto varias veces, lo que hace varias copias de él. El comando para pegar es C-y. Reinserta el último texto eliminado, en @@ -460,7 +460,7 @@ eliminaci Luego teclee M-y y será reemplazado por la primera línea eliminada. Teclee más veces M-y y vea lo que obtiene. Siga haciéndolo hasta que la segunda línea eliminada regrese, y entonces unas pocas - más. Si quiere, puede tratar de darle a M-y argumentos positivos y + más. Si quiere, puede tratar de darle a M-y argumentos positivos y negativos. @@ -477,7 +477,7 @@ adicional. Pero hay dos excepciones: los comandos que no cambian el texto no cuentan (esto incluye los comandos de movimiento del cursor y el comando de desplazamiento), y los caracteres de autoinserción se -manejan usualmente en grupos de hasta 20. (Esto es para reducir el +manejan usualmente en grupos de hasta 20. (Esto es para reducir el numero de C-x u que tenga que teclear para deshacer una inserción en el texto.) @@ -504,7 +504,7 @@ si puede pegarlo con C-y; no hay diferencia alguna para deshacer. Para que pueda hacer permanente el texto que edite, lo debe colocar en un archivo. De otra manera, éste se perderá cuando cierre Emacs. Para poder poner su texto en un archivo, debe "encontrar" el archivo -antes de ingresar el texto. (Esto se llama también "visitar" el +antes de ingresar el texto. (Esto se llama también "visitar" el archivo.) Encontrar un archivo significa que puede ver su contenido dentro de @@ -556,7 +556,7 @@ teclee el comando Esto copia el texto dentro de Emacs al archivo. La primera vez que haga esto, Emacs renombrará el archivo original con un nuevo nombre -para que este no se pierda. El nuevo nombre se hace agregando "~" al +para que éste no se pierda. El nuevo nombre se hace agregando "~" al final del nombre del archivo original. Cuando guardar haya terminado, Emacs mostrará el nombre del archivo @@ -595,13 +595,13 @@ Emacs almacena cada texto del archivo dentro de un objeto llamado Emacs. Para mirar la lista de los buffers que existen actualmente en su sesión de Emacs, teclee: - C-x C-b Lista de Buffers + C-x C-b Lista de buffers >> Pruebe C-x C-b ahora. Vea como cada buffer tiene un nombre, y además puede tener un nombre -de archivo para el archivo que contiene. CUALQUIER texto que vea en -una ventana de Emacs es siempre parte de algún Buffer. +de archivo para el archivo que contiene. CUALQUIER texto que vea en +una ventana de Emacs es siempre parte de algún buffer. >> Teclee C-x 1 para deshacerse de la lista de buffers. @@ -610,14 +610,14 @@ momento. Ese buffer es el que actualmente edita. Si quiere editar otro buffer, necesita "cambiar" a él. Si quiere cambiar a un buffer que corresponde a un archivo, puede hacerlo visitando el archivo de nuevo con C-x C-f. Pero existe una manera más rápida: use el comando -C-x b. En ese comando, necesita teclear el nombre de buffer. +C-x b. En ese comando, necesita teclear el nombre de buffer. >> Teclee C-x b foo para volver al buffer "foo" que contiene el texto del archivo "foo". Después teclee C-x b TUTORIAL.es para regresar a este tutorial. La mayoría del tiempo el nombre del buffer es el mismo que el nombre -del archivo (sin la parte del directorio del archivo). Sin embargo, +del archivo (sin la parte del directorio del archivo). Sin embargo, esto no es así siempre. La lista de buffers que hace con C-x C-b siempre muestra el nombre de todos los buffers. @@ -638,7 +638,7 @@ dentro de Emacs en ese buffer del archivo. La creaci segundo buffer de archivo no afecta al primero. Esto es muy útil, pero también significa que necesita una forma conveniente para guardar el archivo del primer buffer. Sería una molestia tener que volver a -este con C-x C-f para guardarlo con C-x C-s. Así tenemos +éste con C-x C-f para guardarlo con C-x C-s. Así tenemos C-x s Guardar algunos buffers @@ -655,10 +655,10 @@ guardada. Le pregunta, por cada buffer, si quiere guardarlo o no. Hay muchísimos más comandos de Emacs que los que podrían asignarse a todos los caracteres control y meta. Emacs puede darle la vuelta a -esto usando el comando X (eXtendido). Este viene de dos formas: +esto usando el comando X (eXtendido). Éste viene de dos formas: - C-x Carácter eXtendido. Seguido por un carácter. - M-x Comando eXtendido por nombre. Seguido por un nombre + C-x Carácter eXtendido. Seguido por un carácter. + M-x Comando eXtendido por nombre. Seguido por un nombre largo. Estos comandos son generalmente útiles pero menos usados que los @@ -713,7 +713,7 @@ El comando replace-string requiere dos argumentos: la cadena de caracteres a reemplazar, y la cadena de caracteres para reemplazarla. Debe terminar cada argumento con . ->> Mueva el cursor hacia la línea en blanco dos líneas abajo de esta. +>> Mueva el cursor hacia la línea en blanco dos líneas abajo de ésta. A continuación escriba M-x repl scambiadoalterado. @@ -762,7 +762,7 @@ que est Ya sabe qué significa el nombre del archivo: es el archivo que usted ha encontrado. -NN%-- indica su posición actual en el texto; esto significa que NN por ciento del texto está encima de la parte superior -de la pantalla. Si el principio del archivo está en la pantalla, este +de la pantalla. Si el principio del archivo está en la pantalla, éste dirá --Top-- en vez de --00%--. Si el final del texto está en la pantalla, dirá --Bot--. Si está mirando un texto tan pequeño que cabe en la pantalla, el modo de línea dirá --All--. @@ -776,7 +776,7 @@ parte de la l La parte de la línea de modo dentro de los paréntesis es para indicarle en qué modo de edición está. El modo por omisión es -Fundamental, el cual está usando ahora. Este es un ejemplo de un +Fundamental, el cual está usando ahora. Éste es un ejemplo de un "modo mayor". Emacs tiene diferentes modos mayores. Algunos están hechos para @@ -841,7 +841,7 @@ Decimos que el comando "cambia el modo". Debe intercalar espacios porque Auto Fill sólo rompe líneas en los espacios. -El margen esta normalmente puesto en 70 caracteres, pero puede +El margen está normalmente puesto en 70 caracteres, pero puede cambiarlo con el comando C-x f. Debe indicar el margen deseado como un argumento numérico. @@ -1079,7 +1079,7 @@ Un comando similar, C-h v, muestra la documentaci valores pueda poner para adecuar el comportamiento de Emacs. Necesita teclear el nombre de la variable cuando Emacs pregunte por ella. - C-h a Comando Apropos. Teclee una palabra y Emacs hará una + C-h a Comando Apropos. Teclee una palabra y Emacs hará una lista de todos los comandos que contengan esa palabra. Todos estos comandos pueden ser invocados con META-x. Para algunos comandos, el Comando Apropos también @@ -1113,7 +1113,7 @@ correspondientes tales como find-file. --------------------- Puede aprender más de Emacs leyendo su manual, ya sea como libro o en -línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r). Dos +línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r). Dos características que pueden gustarle son la completación, que ahorra teclear, y dired, que simplifica el manejo de archivos. @@ -1126,7 +1126,7 @@ llamado "Completation". Dired le permite listar los archivos en un directorio (y opcionalmente sus subdirectorios), moverse alrededor de esa lista, visitar, -renombrar, borrar y aparte de eso operar en los archivos. Dired esta +renombrar, borrar y aparte de eso operar en los archivos. Dired está descrito en el Info en el manual de Emacs en el nodo llamado "Dired". El manual también describe otras características de Emacs. @@ -1189,7 +1189,7 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, posterior como lo permite esta nota. Se permite distribuir versiones modificadas de este documento, o - porciones de este, bajo las condiciones anteriores, siempre que + porciones de éste, bajo las condiciones anteriores, siempre que ellas tengan nota visible especificando quién fue el último en alterarlas. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e922bcacd4..1084d601706 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-10-12 Juanma Barranquero + * international/mule.el (define-coding-system): + * international/titdic-cnv.el (quail-cxterm-package-ext-info): * composite.el (compose-region): Fix typo in docstring. 2010-10-10 Jan Djärv @@ -22,7 +24,7 @@ 2010-10-09 Richard Sharman (tiny change) * progmodes/gdb-ui.el (gdb-mouse-toggle-breakpoint-margin) - (gdb-mouse-toggle-breakpoint-fringe): Correct regexp to + (gdb-mouse-toggle-breakpoint-fringe): Correct regexp to work when breakpoint number exceeds nine. 2010-10-05 David Koppelman @@ -1065,7 +1067,7 @@ 2010-05-03 Chong Yidong - * international/mule.el (auto-coding-alist): Only purecopy + * international/mule.el (auto-coding-alist): Only purecopy car of each item, not the whole list (Bug#6083). 2010-05-02 Chong Yidong diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index dd96ee162f1..f5be5b6f1f8 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -570,11 +570,11 @@ 1986-01-18 Richard M. Stallman (rms@prep) - * doctor.el: Fix typo "symtoms". + * doctor.el: Fix typo "symtoms". 1986-01-10 Richard Mlynarik (mly@prep) - * mail-utils.el (mail-fetch-field) + * mail-utils.el (mail-fetch-field): regexp-quote the argument. 1986-01-10 Richard M. Stallman (rms@prep) @@ -917,7 +917,7 @@ * files.el (normal-mode): New command to choose major mode automatically. - * inc-vers.el: Renamed from inc-version.el + * inc-vers.el: Renamed from inc-version.el for file name length reasons. * term/*.el: terminal-specific files found here now. @@ -2523,10 +2523,10 @@ No, this directory is added automatically to the path used by call-process. It should have worked before. - RMS - * loaddefs.el: C-z -> C-c in documentation for mail. + * loaddefs.el: C-z -> C-c in documentation for mail. autoload report-emacs-bug from emacsbug.el. - * emacsbug.el: New file. Reports bugs with version info. + * emacsbug.el: New file. Reports bugs with version info. * helper.el (Helper-describe-bindings): Make it describe local bindings faster by binding global map to @@ -2587,7 +2587,7 @@ 1985-06-11 K. Shane Hartman (shane@mit-prep) - * ebuff-menu.el: Make M-C-v scroll-other-window instead of + * ebuff-menu.el: Make M-C-v scroll-other-window instead of scroll-down. Make M-v scroll-down. * ebuff-menu.el, echistory.el: Made them use electric. @@ -2602,7 +2602,7 @@ Made it use helper.el. Remove kill-ring-save stuff pending use of new winning prin1-to-string for minibuffer hacking. - * view.el: Made it use helper.el. + * view.el: Made it use helper.el. * helper.el: New module for packages which want to do help without giving up @@ -2804,7 +2804,7 @@ 1985-06-01 K. Shane Hartman (shane@mit-prep) - * loaddefs.el: Update documentation for rmail. + * loaddefs.el: Update documentation for rmail. * lisp-mode.el (calculate-lisp-indent): Asked (fboundp 'lisp-indent-hook). Right question is boundp. @@ -2858,7 +2858,7 @@ Skip strings, comments, char constants. Find symbols even if they have no letters in them. - * mlsupport.el: Insert symbol-value call in use-local-map. + * mlsupport.el: Insert symbol-value call in use-local-map. Handle key codes > 127 in local-bind-to-key. Write ml-modify-syntax-entry. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 95f59243cb1..270fe8d6aeb 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -1140,7 +1140,7 @@ (rcirc-keepalive-seconds): Remove variable. (rcirc-server-name, rcirc-timeout-timer, rcirc-connecting) (rcirc-process, rcirc-user-disconnect): New variables. - (rcirc-connect): Initalize new variables. + (rcirc-connect): Initialize new variables. (rcirc-keepalive): Don't send keepalive pings before connection is completed. (rcirc-sentinel): Do mark all channels with activity when diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 12ea1f45e17..c5a51f813a7 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -7567,7 +7567,7 @@ (ediff-setup-windows-plain-merge) (ediff-setup-windows-plain-compare, ediff-setup-control-frame) (ediff-refresh-control-frame, ediff-get-visible-buffer-window): - * ediff-util.el (ediff-setup-keymap, ) + * ediff-util.el (ediff-setup-keymap) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-really-quit) (ediff-good-frame-under-mouse) diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 1edfd9081d0..1a22e27a816 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -640,7 +640,7 @@ 2009-04-11 Chong Yidong - * files.el (dir-locals-directory-cache): Rename from + * files.el (dir-locals-directory-cache): Rename from dir-locals-directory-alist. Change format to include the mtime of the directory-local variables file (Bug#2833). (dir-locals-set-directory-class): New arg mtime. Store it in diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index fadec1174c8..d14bf04a56b 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -1172,7 +1172,7 @@ 1999-12-03 Kenichi Handa - * international/mule-util.el (truncate-string-to-width): Docsting + * international/mule-util.el (truncate-string-to-width): Docstring fixed. 1999-12-02 Stefan Monnier diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 6250bd0917a..a6112f97825 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -1667,7 +1667,7 @@ * Makefile.in (finder_setwins): Renamed from nonobsolete_setwins. Don't include term/. - * mail/sc.el: Moved to obsolete/. + * mail/sc.el: Moved to obsolete/. 2001-08-14 Vinicius Jose Latorre @@ -5547,7 +5547,7 @@ 2001-02-12 Dave Love - * international/latin1-disp.el: Doc fixes. + * international/latin1-disp.el: Doc fixes. (latin1-display) : Add :link. (latin1-display) : Set variable latin1-display. @@ -5773,7 +5773,7 @@ 2001-02-05 Kenichi Handa * isearch.el (isearch-forward): Add description about input method - in the docsting. + in the docstring. 2001-02-04 Stefan Monnier @@ -8121,7 +8121,7 @@ * dired.el (dired-get-filename): Return filename verbatim if LOCALP is `verbatim'. * dired-aux.el (dired-add-entry): Call `dired-get-filename' with - `verbatim' so that we don't inadvertently delete a non-existant + `verbatim' so that we don't inadvertently delete a non-existent directory name. 2000-11-27 Kenichi Handa @@ -8747,7 +8747,7 @@ 2000-11-13 Miles Bader * textmodes/fill.el (skip-line-prefix): New function. - (fill-region-as-paragraph, fill-region): Return the fill-prefix. + (fill-region-as-paragraph, fill-region): Return the fill-prefix. (fill-paragraph): Don't leave point inside the fill-prefix. * textmodes/refill.el (refill-fill-paragraph-at): Don't leave point inside the fill-prefix. @@ -10795,7 +10795,7 @@ 2000-10-06 Dave Love * textmodes/fill.el (sentence-end-double-space) - (sentence-end-without-period): Doc fix. + (sentence-end-without-period): Doc fix. (adaptive-fill-regexp): Purecopy. (unjustify-current-line): Use line-end-position. (fill-individual-paragraphs-prefix): Use line-beginning-position. @@ -11871,7 +11871,7 @@ * strokes.el: Sync with maintainer's current version with changes for Emacs, but avoid runtime cl and levents. - (toplevel): Change autoloads and compilation requires. + (toplevel): Change autoloads and compilation requires. (strokes-version, strokes-bug-address, strokes-lift): Values changed. (strokes-xpm-header, strokes-insinuated): New variable. @@ -11934,12 +11934,12 @@ 2000-09-14 Dave Love * toolbar/cancel.xpm, toolbar/close.xpm, toolbar/copy.xpm, - toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, - toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, - toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, - toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, - toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, - toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. + * toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, + * toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, + * toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, + * toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, + * toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, + * toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. From Tuomas Kuosmanen . (Gnome icons fetched from .) @@ -14832,7 +14832,7 @@ (comint-replace-by-expanded-history) (comint-get-old-input-default, comint-show-output) (comint-backward-matching-input, comint-forward-matching-input) - (comint-next-prompt, comint-previous-prompt): Use field + (comint-next-prompt, comint-previous-prompt): Use field properties if comint-use-prompt-regexp-instead-of-fields is nil. (comint-line-beginning-position): New function. (comint-bol): Use comint-line-beginning-position. Make ARG optional. @@ -18040,7 +18040,7 @@ (help-xref-interned): Maybe insert face doc too. Separate sections with a line of hyphens. - * faces.el: Some doc fixes. Declare some functions obsolete. + * faces.el: Some doc fixes. Declare some functions obsolete. (describe-face): Add customize button. Return the help text. Fix prompt. @@ -19040,7 +19040,7 @@ (fontset-default-styles): Likewise. (x-modify-font-name): Function removed. (create-fontset-from-fontset-spec): Ignore the argument STYLE-VARIANT. - (create-fontset-from-ascii-font): Docsting adjusted for the above + (create-fontset-from-ascii-font): Docstring adjusted for the above change. (instantiate-fontset, resolve-fontset-name): Functions removed. (fontset-list): Now implemented by C code. @@ -20406,7 +20406,7 @@ 2000-01-10 Ken Stevens - * ispell.el: Only define dictionaries in menus when they exist. + * ispell.el: Only define dictionaries in menus when they exist. (version18p): New variable. (version20p): New variable. (xemacsp): New variable. diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index c0d96e795cc..a9eaf9ded1e 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,9 @@ +2010-10-12 Juanma Barranquero + + * semantic/symref/list.el (semantic-symref-list-rename-open-hits): + Fix typo in message. + (semantic-symref-list-map-open-hits): Fix typo in docstring. + 2010-09-30 Chong Yidong * semantic/bovine/el.el: @@ -11,8 +17,8 @@ * semantic/db-typecache.el (semanticdb-typecache-find-default): * semantic/imenu.el (semantic-create-imenu-index): * semantic/grammar.el (semantic--grammar-macro-function-tag): - * semantic/fw.el (semanticdb-without-unloaded-file-searches): Fix - require. Suggested by David Engster. + * semantic/fw.el (semanticdb-without-unloaded-file-searches): + Fix require. Suggested by David Engster. * semantic/bovine/c-by.el: Regenerate. diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index f1f24ed339f..4da210682f8 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -452,7 +452,7 @@ Do this by extracting the lowest directory name." ;; Targets and projects are often associated with other files, such as ;; header files, documentation files and the like. Have strong ;; associations can make useful user commands to quickly navigate -;; between the files base on their assocaitions. +;; between the files based on their associations. ;; (defun ede-header-file () "Return the header file for the current buffer. diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index 9e0ee2a1b5b..53044e278ac 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -492,7 +492,7 @@ Closed items will be skipped." (let ((count (semantic-symref-list-map-open-hits (lambda () (replace-match newname nil t))))) (semantic-symref-list-update-open-hits) - (message "Renamed %d occurances." count))) + (message "Renamed %d occurrences." count))) ;;; REFACTORING UTILITIES ;; @@ -501,7 +501,7 @@ Closed items will be skipped." (defun semantic-symref-list-map-open-hits (function) "For every open hit in the symref buffer, perform FUNCTION. The `match-data' will be set to a successful hit of the searched for symbol. -Return the number of occurances FUNCTION was operated upon." +Return the number of occurrences FUNCTION was operated upon." ;; First Pass in this function - a straight rename. ;; Second Pass - Allow context specification based on diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 4950511ebe2..7605f457316 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -383,7 +383,7 @@ (eq 'lambda (car-safe fn))) (let ((newform (byte-compile-unfold-lambda form))) (if (eq newform form) - ;; Some error occured, avoid infinite recursion + ;; Some error occurred, avoid infinite recursion form (byte-optimize-form-code-walker newform for-effect)))) ((memq fn '(let let*)) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 3dea16b6dbf..4568b598a3b 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero + + * erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. + 2010-05-07 Chong Yidong * Version 23.2 released. diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el index 403be5f720e..8d900e8291e 100644 --- a/lisp/erc/erc-xdcc.el +++ b/lisp/erc/erc-xdcc.el @@ -56,7 +56,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this." (erc-current-nick) " XDCC send #\" to get a particular file number.")) "*Help text sent in response to XDCC help command. A list of messages, each consisting of strings and expressions, expressions -being evaluated and should return stings." +being evaluated and should return strings." :group 'erc-dcc :type '(repeat (repeat :tag "Message" (choice string sexp)))) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 931ce7182c6..e6024b3e95e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero + + * nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring. + 2010-09-21 Glenn Morris * message.el (message-output): Use gnus-output-to-rmail if a buffer is diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index cd7f3b56aad..cdfc53c979c 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -2603,7 +2603,7 @@ * message.el (message-use-idna): Use mm-coding-system-p. (message-tokenize-header, message-make-organization) - (message-make-from): Use with-temp-buffer. + (message-make-from): Use with-temp-buffer. (message-set-work-buffer): Deleted. (message-fill-paragraph): Use `if' not `and' for compiler warning. (message-check-news-header-syntax): Remove useless lambda. @@ -5550,7 +5550,7 @@ * gnus-audio.el (gnus-audio-au-player): Use executable-find. -2003-01-13 Jhair Tocancipa Triana +2003-01-13 Jhair Tocancipa Triana * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use /usr/bin/play as default player. @@ -5643,7 +5643,7 @@ 2003-01-12 Raymond Scholz - * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a + * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a regexp or a function too. (gnus-confirm-treat-mail-like-news): New variable. Ask for confirmation even if the original article is mail. @@ -12167,7 +12167,7 @@ 2001-12-05 12:00:00 ShengHuo ZHU * gnus-group.el (gnus-group-find-new-groups): Fix doc. - From: Stefan Monnier + From: Stefan Monnier 2001-12-05 Katsumi Yamaoka @@ -14682,7 +14682,7 @@ * gnus-eform.el (gnus-edit-form-done): Return nil if end-of-file. 2001-07-16 12:00:00 ShengHuo ZHU - From: Stefan Monnier + From: Stefan Monnier * message.el (message-mode): Use define-derived-mode. (message-tab): message-completion-alist. @@ -16855,7 +16855,7 @@ * gnus-msg.el (gnus-summary-mail-forward): ??? - * message.el (message-forward): Move mime-to-mml here. + * message.el (message-forward): Move mime-to-mml here. 2000-12-20 02:00:00 ShengHuo ZHU @@ -17157,7 +17157,7 @@ * nnheader.el: Wrap subst-char-in-string def in eval-and-compile. Put some defvars in eval-when-compile. - (gnus-intersection, gnus-sorted-complement): Autoload. + (gnus-intersection, gnus-sorted-complement): Autoload. * imap.el (imap-point-at-eol): New, replacing gnus-point-at-eol. @@ -17329,7 +17329,7 @@ * qp.el (mm-decode-coding-region, mm-encode-coding-region): Autoload. - (quoted-printable-decode-region): Rename arg which confused + (quoted-printable-decode-region): Rename arg which confused charset with coding-system. Don't use nonascii-insert-offset. Coding-system encode the region initially. Don't recognize `==' as valid QP. Coding-system decode the region finally. @@ -17384,7 +17384,7 @@ 2000-09-29 Gerd Moellmann - * smiley-ems.el (smiley-update-cache): Use `:ascent center'. + * smiley-ems.el (smiley-update-cache): Use `:ascent center'. 2000-09-21 Dave Love @@ -18036,7 +18036,7 @@ * gnus-art.el (gnus-mime-display-part): Show MIME security button. (gnus-insert-mime-security-button): New function. * mm-decode.el (mm-possibly-verify-or-decrypt): Add security info. - * mml2015.el: Add security info when verify or decrypt. + * mml2015.el: Add security info when verify or decrypt. * mm-uu.el (mm-uu-pgp-signed-extract): Use multipart. (mm-uu-pgp-encrypted-extract): Ditto. @@ -18433,7 +18433,7 @@ (mm-dissect-multipart): Use it. * mml2015.el (mml2015-fix-micalg): New function. (mml2015-decrypt): Use new interface. - (mml2015-verify): Use new interface. + (mml2015-verify): Use new interface. (mml2015-setup): Make it bogus. 2000-10-28 16:54:45 ShengHuo ZHU diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 8bf0cbf5de1..58c69b8cc35 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -225,7 +225,7 @@ Example: In this case, articles containing the string \"boss\" in the To or the From header will be expired to the group \"nnfolder:Work\"; -articles containing the sting \"IMPORTANT\" in the Subject header will +articles containing the string \"IMPORTANT\" in the Subject header will be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and everything else will be expired to \"nnfolder:Archive-YYYY\"." :version "22.1" diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 992c6bd16bb..6e1be8b4465 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -653,7 +653,7 @@ VALUE must be a function to call after all functions in `write-region-annotate-functions' and `buffer-file-format' are called, and before the text is encoded by the coding system itself. This function should convert the whole text in the -current buffer. For backward compatibility, this funciton is +current buffer. For backward compatibility, this function is passed two arguments which can be ignored. `:default-char' diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index afe5dda1f57..92b4251b49c 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -108,7 +108,7 @@ For double-width GB2312 characters correponding to ASCII, use the input method `chinese-qj'.") ("chinese-ecdict" "$(05CKH(B" -"In this input method, you enter a Chinese (Big5) charactere or word +"In this input method, you enter a Chinese (Big5) character or word by typing the corresponding English word. For example, if you type \"computer\", \"$(0IZH+(B\" is input. diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 2e061558466..4435ec9bd1e 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -621,7 +621,7 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data." ;; They tend to be bogus on non-UNIX platforms anyway so ;; optionally hide them. (if (memq 'uid ls-lisp-verbosity) - ;; uid can be a sting or an integer + ;; uid can be a string or an integer (let ((uid (nth 2 file-attr))) (format (if (stringp uid) ls-lisp-uid-s-fmt diff --git a/lisp/man.el b/lisp/man.el index 658c1ebbcef..6dde5d7c178 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -309,7 +309,7 @@ This regexp should not start with a `^' character.") "Regular expression describing references to normal files.") ;; This includes the section as an optional part to catch hyphenated -;; refernces to manpages. +;; references to manpages. (defvar Man-hyphenated-reference-regexp (concat "\\(" Man-name-regexp "\\)\\((\\(" Man-section-regexp "\\))\\)?") "Regular expression describing a reference in the SEE ALSO section.") diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index a51bd2872c3..c2c9a2df181 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -794,7 +794,7 @@ Merged in 7.4.4 changes, described below. - * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. 2004-07-10 Bill Wohler @@ -2197,7 +2197,7 @@ * mh-comp.el (mh-extract-rejected-mail, mh-letter-mode-message): Ditto. - * mh-e.el (mh-refile-a-msg): Ditto. + * mh-e.el (mh-refile-a-msg): Ditto. * mh-funcs.el (mh-undo-folder): Ditto. @@ -2509,7 +2509,7 @@ 2003-07-28 Peter S Galbraith - * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' + * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' operation. * mh-mime.el (mh-mm-inline-message): Same. @@ -2697,7 +2697,7 @@ 2003-06-24 Bill Wohler - * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. 2003-06-25 Bill Wohler @@ -2719,7 +2719,7 @@ 2003-06-24 Bill Wohler - * mh-e.el (Version, mh-version): Set to 7.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4+cvs. 2003-06-24 Bill Wohler @@ -4106,7 +4106,7 @@ 2003-04-06 Bill Wohler - * mh-comp.el (mh-forward): Updated docstrings to indicate that a + * mh-comp.el (mh-forward): Updated docstrings to indicate that a list of messages is acceptable as well. * mh-e.el (mh-delete-msg, mh-delete-msg-no-motion, mh-refile-msg) @@ -4198,7 +4198,7 @@ 2003-04-04 Peter S Galbraith - * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of + * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of `when' block. 2003-04-04 Satyaki Das @@ -7248,7 +7248,7 @@ 2002-11-13 Mark D. Baushke - * mh-identity.el (mh-insert-identity): A value of either nil or + * mh-identity.el (mh-insert-identity): A value of either nil or "" should cause the field to be removed. (mh-identity-list): Update the docstring. @@ -7913,7 +7913,7 @@ (mh-folder-font-lock-subject): Adapt to new mh-scan-subject-regexp. * mh-seq.el (mh-subject-to-sequence): Ditto. - * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject + * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject Thread" from menu. mh-toggle-threads is in the Folder menu. * mh-e.el (mh-folder-sequence-menu): Minor menu text edits. @@ -8252,7 +8252,7 @@ (mh-thread-generate-scan-lines): Renamed dupl-p as dupl-flag. This addresses part of SF #627015. - * mh-index.el (mh-index-advance): Renamed backward-p + * mh-index.el (mh-index-advance): Renamed backward-p local variable as backward-flag. (mh-index-next-button): Renamed backward-p argument as backward-flag. @@ -9220,7 +9220,7 @@ decide how many buttons to use for replying. * mh-mime.el (mh-file-mime-type-substitutions) - (mh-file-mime-type-substitute): Fix typos and doc strings. + (mh-file-mime-type-substitute): Fix typos and doc strings. 2002-09-30 Peter S Galbraith @@ -9325,7 +9325,7 @@ 2002-08-19 Peter S Galbraith * reply-to.xpm, reply-to.pbm, reply-from.xpm, reply-from.pbm, - * reply-all.xpm, reply-all.pbm: New icons for various reply methods. + * reply-all.xpm, reply-all.pbm: New icons for various reply methods. * mh-e.el (mh-folder-tool-bar-map): Split reply button into three that won't prompt for "from", "to" and "all". * mh-comp.el (mh-reply): Put variable reply-to in the interactive @@ -9764,13 +9764,13 @@ to `mh-mml-to-mime' in `mh-send-letter'. (mh-mml-secure-message-sign-pgpmime): New function. Front end to mml-secure-message-sign-pgpmime. - (mh-mml-secure-message-encrypt-pgpmime): New function. + (mh-mml-secure-message-encrypt-pgpmime): New function. Front end to mml-secure-message-encrypt-pgpmime. * mh-comp.el (mh-send-letter): automatic call to `mh-mml-to-mime' if mh-mml-compose-insert-p is set. (mh-letter-mode-map): Add keys for new mh-mime functions above. - * mh-comp.el: Added autoloads for new mh-mime functions above. + * mh-comp.el: Added autoloads for new mh-mime functions above. 2002-06-17 Peter S Galbraith @@ -11010,8 +11010,8 @@ 2001-11-20 Peter S Galbraith * mh-comp.el (mh-letter-mode): Make font-lock-defaults a local variable - * mh-e.el (mh-folder-mode): Same. - * mh-utils.el (mh-show-mode): Same. + * mh-e.el (mh-folder-mode): Same. + * mh-utils.el (mh-show-mode): Same. * mh-e.el (mh-scan-msg-num-regexp): Delete variable and replace with mh-good-msg-regexp. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 405232742a3..05da19ee0a4 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,8 @@ +2010-10-12 Juanma Barranquero + + * org-agenda.el (org-prefix-category-length) + (org-prefix-category-max-length): Fix typos in docstrings. + 2010-05-07 Chong Yidong * Version 23.2 released. @@ -5,7 +10,7 @@ 2010-02-15 Chong Yidong * org-freemind.el (org-freemind-from-org-mode-node) - (org-freemind-from-org-mode, ) + (org-freemind-from-org-mode) (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Pass arg to called-interactively-p. diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 22399e9a8a3..856e7f34e32 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -4501,9 +4501,9 @@ The flag is set if the currently compiled format contains a `%T'.") "A flag, set by `org-compile-prefix-format'. The flag is set if the currently compiled format contains a `%e'.") (defvar org-prefix-category-length nil - "Used by `org-compile-prefix-format' to remember the category field widh.") + "Used by `org-compile-prefix-format' to remember the category field width.") (defvar org-prefix-category-max-length nil - "Used by `org-compile-prefix-format' to remember the category field widh.") + "Used by `org-compile-prefix-format' to remember the category field width.") (defun org-format-agenda-item (extra txt &optional category tags dotime noprefix remove-re habitp) diff --git a/lisp/simple.el b/lisp/simple.el index 28b60cc1cf5..ba7788ead2d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4260,7 +4260,7 @@ into account variable-width characters and line continuation." (goto-char (next-char-property-change (point)))) ;; Move a line. ;; We don't use `end-of-line', since we want to escape - ;; from field boundaries ocurring exactly at point. + ;; from field boundaries occurring exactly at point. (goto-char (constrain-to-field (let ((inhibit-field-text-motion t)) (line-end-position)) diff --git a/src/ChangeLog b/src/ChangeLog index 01ecd37eec7..7c1faad6aab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,6 @@ 2010-10-12 Juanma Barranquero + * font.c (Ffont_variation_glyphs): * ccl.c (Fccl_execute_on_string): Fix typo in docstring. 2010-10-10 Jan Djärv @@ -138,7 +139,7 @@ (x_produce_glyphs): Simplify by using the same code for ASCII and non-ASCII characters. Don't set it->char_to_display here. Don't handle unibyte-display-via-language-environment here. For a - charater of no glyph, use font->space_width instead of FONT_WIDTH. + character of no glyph, use font->space_width instead of FONT_WIDTH. 2010-08-29 Kenichi Handa @@ -175,7 +176,7 @@ * charset.c: Include (struct charset_sort_data): New struct. (charset_compare): New function. - (Fsort_charsets): New funciton. + (Fsort_charsets): New function. (syms_of_charset): Declare Fsort_charsets as a Lisp function. * coding.c (decode_coding_iso_2022): Fix checking of dimension @@ -13876,7 +13877,7 @@ (Ffont_shape_text): New function. (Fopen_font): If the font size is not given, use 12-pixel. (Ffont_at): New arg STRING. - (syms_of_font): Initalize font_charset_alist. + (syms_of_font): Initialize font_charset_alist. Declare Ffont_shape_text as a Lisp function. Call syms_of_XXfont conditionally. @@ -14873,7 +14874,7 @@ * font.c (font_unparse_fcname): Fix typo (swidth->width). (font_list_entities): Check driver_list->on. - (register_font_driver): Initalize `on' member to 0. + (register_font_driver): Initialize `on' member to 0. (font_update_drivers): New function. (Fclear_font_cache): Check driver_list->on. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 265cc95e60d..d90e326f970 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -683,7 +683,7 @@ (That `select' saw something on channel 0 doesn't mean it is kbd input; it could be an expose event.) - * keyboard.c (read_avail_input) [FIONREAD]: Now static. + * keyboard.c (read_avail_input) [FIONREAD]: Now static. New arg specifies value of NREAD; if it is nonzero, don't call get_input_pending to get it. Use kbd_buffer_store_char to put chars into kbd_buffer. @@ -1210,7 +1210,7 @@ Remove #ifndef VMS around the sleep when buffer is full. * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use. - * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. + * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. 1987-07-17 Paul Rubin (phr@prep) @@ -1442,7 +1442,7 @@ Turn on call to vmserrstr. * sysdep.c (vmserrstr) [VMS]: Define this function. - * process.c (create_process) [IRIS]: Don't open the pty's tty + * process.c (create_process) [IRIS]: Don't open the pty's tty in the parent process. Open only once, in the child. * xdisp.c (redisplay_window): If window-start points nowhere, @@ -1544,8 +1544,8 @@ 1987-05-05 Richard Mlynarik (mly@prep) - * m-irist.h: New version from raible@orville.arpa - * s-iris3-5.h: New file. (s-usg5-2 with additions) + * m-irist.h: New version from raible@orville.arpa + * s-iris3-5.h: New file. (s-usg5-2 with additions) * keyboard.c: IRIS, like HPUX, #defines but does not implement FIONREAD. @@ -1563,10 +1563,10 @@ 1987-04-27 Richard Mlynarik (mly@prep) * fileio.c (APOLLO from lnz): - Fcopy_file, Fset_file_modes: Don't use un*x modes if + (Fcopy_file, Fset_file_modes): Don't use un*x modes if env var USE_DOMAIN_ACLS is set. - Fset_file_modes: utimes fix. - Finsert_file_contents: Must do fstat after open for Apollo. + (Fset_file_modes): utimes fix. + (Finsert_file_contents): Must do fstat after open for Apollo. * emacs.c (main): (APOLLO from lnz): Don't use un*x modes if env var USE_DOMAIN_ACLS set. @@ -1675,7 +1675,7 @@ 1987-03-20 Richard Mlynarik (mly@prep) - * filemode.c: Hacks for set-uid/gid but not executable. + * filemode.c: Hacks for set-uid/gid but not executable. 1987-03-20 Richard M. Stallman (rms@prep) @@ -1966,7 +1966,7 @@ 1987-02-22 Richard M. Stallman (rms@prep) - * dispnew.c (Fopen_termscript): Close existing termscript + * dispnew.c (Fopen_termscript): Close existing termscript file before trying to open a new one. Report open failure with report_file_error. @@ -2071,9 +2071,9 @@ 1987-02-10 Richard Mlynarik (mly@prep) - * xfns.c (Fx_get_default): Add (unsigned char *) cast. + * xfns.c (Fx_get_default): Add (unsigned char *) cast. - * window.c: typo. + * window.c: Typo. 1987-02-09 Richard M. Stallman (rms@prep) @@ -2853,7 +2853,7 @@ local variables for more register decls. Compute and pass `envlen' arg to child_setup. - * process.c (create_process): Compute and pass `envlen' arg + * process.c (create_process): Compute and pass `envlen' arg to child_setup. * xterm.c (x_term_init): Don't call XPopUpWindow at all. @@ -3998,7 +3998,7 @@ * editfns.c (Fuser_uid, Fuser_real_uid): New functions that return values of geteuid and getuid system calls. - * dired.c (Ffile_attributes): Value has additional element + * dired.c (Ffile_attributes): Value has additional element t iff file gid would change if Emacs deletes it and recreates it. * xdisp.c (display_mode_element): @@ -4078,7 +4078,7 @@ being unbound. struct catchtag has two new fields, gcpro and pdlcount. - * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. + * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. * eval.c (internal_catch): No need to restore anything from the catchtag after throw, because unbind_catch does it all. @@ -4657,7 +4657,7 @@ * fileio.c (Ffile_newer_than_file_p): New Lisp primitive. - * fileio.c (Ffile_exists_p): this is now distinct from + * fileio.c (Ffile_exists_p): This is now distinct from Ffile_readable_p; it checks only for existence, not for readability. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index fbe3f752aed..11c818f18d9 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -5146,7 +5146,7 @@ Change mouse movement events to be arranged like click events. (format_modifiers): Note that the click modifier has no written representation. - (modifier_names, modifer_symbols): New variables, used to + (modifier_names, modifier_symbols): New variables, used to create the Qevent_symbol_elements property. (modify_event_symbol): Change the format of the modified symbol cache; there are too many modifier bits now to use a @@ -5154,8 +5154,8 @@ Document the format of the cache. Put the Qevent_symbol_elements property on each new symbol, instead of a Qevent_unmodified property. - (symbols_of_keyboard): Put Qevent_symbol_elements properties on - the symbols specified in head_table, not Qevent_unmodifed properties. + (symbols_of_keyboard): Put Qevent_symbol_elements properties on the + symbols specified in head_table, not Qevent_unmodified properties. Initialize and staticpro modifier_symbols, and staticpro the window elements of button_down_location. @@ -11207,7 +11207,7 @@ events to send the function key number instead of a symbol. * keyboard.c (modify_event_symbol): Re-arranged to work well with function key/mouse button numbers instead of symbols. - And if (MODIFIERS & up_modifer), prepend "U-" to the name of the + And if (MODIFIERS & up_modifier), prepend "U-" to the name of the symbol being constructed. (make_lispy_event): Use the new modify_event_symbol. diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index d30bd1bdb00..89d43526609 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -3107,7 +3107,7 @@ * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame, Lisp_Subr deleted. - (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. + (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors. (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise. (FRAMEP, GC_FRAMEP): Likewise. @@ -4093,7 +4093,7 @@ * xterm.h: Delete X10 code. - * xfns.c (Fx_create_frame): Don't increment refernce_count + * xfns.c (Fx_create_frame): Don't increment reference_count until the frame is put on the frame list. * xterm.c (x_initialize): Init x_noop_count, x_focus_frame @@ -7039,7 +7039,7 @@ 1994-06-07 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * mips-siemens.h: Include pyramid.h, not mips.h. + * mips-siemens.h: Include pyramid.h, not mips.h. (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted. (NO_ARG_ARRAY, HAVE_ALLOCA): Defined. (BROKEN_FIONREAD): Add #undef. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index a334b4806da..b5927108808 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -1040,7 +1040,7 @@ * lread.c: Remember the last TWO strings skipped with #@. (prev_saved_doc_string*): New variables. - (Fload): Initalize prev_saved_doc_string. + (Fload): Initialize prev_saved_doc_string. (read1): Copy saved_doc_string to prev_saved_doc_string before storing a new string in saved_doc_string. (read_list): Look in prev_saved_doc_string as well as diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 6da7b6862a5..eeaae29db52 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -3686,7 +3686,7 @@ * lread.c (read_escape): For Control modifier, pay attention to multibyte character. (read1): Likewise. Signal error or a multibyte character which - has a modifer bit. Check validity of Shift modifer. + has a modifier bit. Check validity of Shift modifier. * charset.c (non_ascii_char_to_string): Handle modifier bits as the same as Lisp reader. diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index b161a21eb72..a56c1a2c088 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -3896,7 +3896,7 @@ 2001-01-07 Dave Love - * keyboard.c (Fread_key_sequence_vector): Avoid newline in + * keyboard.c (Fread_key_sequence_vector): Avoid newline in arglist, for documentation's sake. 2001-01-06 Andrew Innes @@ -4180,7 +4180,7 @@ what's displayed in the window. * xdisp.c (try_window_reusing_current_matrix) - : Disable rows in the current matrix + : Disable rows in the current matrix which are below the window after scrolling. * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P @@ -5480,7 +5480,7 @@ * lisp.h (pos_visible_p): Change prototype. * dispextern.h (CURRENT_MODE_LINE_HEIGHT) - (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height + (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height and current_header_line_height first. (current_mode_line_height, current_header_line_height): Declare extern. @@ -6683,7 +6683,7 @@ (create_offscreen_bitmap): New function. (w32_BDF_TextOut): Use it. Draw glyphs as DIBs. - * w32term.c (x_produce_glyphs): If the distance from the current + * w32term.c (x_produce_glyphs): If the distance from the current position to the next tab stop is less than a canonical character width, use the tab stop after that. (x_draw_glyphs): Handle case START and END are out of bounds more @@ -7536,7 +7536,7 @@ CYCLE_CHECK arguments. (merge_face_vector_with_property, Finternal_merge_in_global_face) (lookup_named_face, lookup_derived_face, realize_named_face) - (face_at_string_position, face_at_buffer_position): Supply + (face_at_string_position, face_at_buffer_position): Supply new F and CYCLE_CHECK arguments to merge_face_vectors. (merge_face_heights): New function. (merge_face_vectors, merge_face_vector_with_property) @@ -7826,7 +7826,7 @@ (x_compute_glyph_string_overhangs): Incomplete body removed, as the X way of doing this will not work for W32. (w32_intersect_rectangles): Removed. Use IntersectRect API call. - (x_draw_image_foreground): Avoid drawing outside of the clip area + (x_draw_image_foreground): Avoid drawing outside of the clip area when image doesn't have a mask. (note_mouse_highlight): Process overlays in the right order of priority. Set help_echo_window. @@ -10156,7 +10156,7 @@ (encode_coding_string): Likewise. * ccl.c (ccl_driver) - : Handle charsets eight-bit-control and + : Handle charsets eight-bit-control and eight-bit-graphic correctly. 2000-05-24 Kenichi HANDA @@ -12812,7 +12812,7 @@ (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback) (xim_initialize, xim_close) [HAVE_X_I18N && HAVE_X11R6]: New functions. - (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. + (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. (x_term_init) [HAVE_X_I18N]: Call xim_initialize. (x_delete_display) [HAVE_X_I18N]: Call xim_close. diff --git a/src/font.c b/src/font.c index 765712198fe..c72f189d87f 100644 --- a/src/font.c +++ b/src/font.c @@ -4634,7 +4634,7 @@ DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs, doc: /* Return a list of variation glyphs for CHAR in FONT-OBJECT. Each element of the value is a cons (VARIATION-SELECTOR . GLYPH-ID), where - VARIATION-SELECTOR is a chracter code of variation selection + VARIATION-SELECTOR is a character code of variation selection (#xFE00..#xFE0F or #xE0100..#xE01EF) GLYPH-ID is a glyph code of the corresponding variation glyph. */) (font_object, character) diff --git a/src/frame.h b/src/frame.h index 887d47eff21..8f5e47c40a5 100644 --- a/src/frame.h +++ b/src/frame.h @@ -306,7 +306,7 @@ struct frame /* Canonical X unit. Width of default font, in pixels. */ int column_width; - /* Widht of space glyph of default font, in pixels. */ + /* Width of space glyph of default font, in pixels. */ int space_width; /* Canonical Y unit. Height of a line, in pixels. */ diff --git a/src/nsterm.m b/src/nsterm.m index fc933c099e8..d1b984d5382 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -145,24 +145,24 @@ Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone; extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; /* Specifies which emacs modifier should be generated when NS receives - the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */ + the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */ Lisp_Object ns_alternate_modifier; /* Specifies which emacs modifier should be generated when NS receives - the right Alternate modifer. Has same values as ns_alternate_modifier plus + the right Alternate modifier. Has same values as ns_alternate_modifier plus the value Qleft which means whatever value ns_alternate_modifier has. */ Lisp_Object ns_right_alternate_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Command modifer. May be any of the modifier lisp symbols. */ + the Command modifier. May be any of the modifier lisp symbols. */ Lisp_Object ns_command_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Control modifer. May be any of the modifier lisp symbols. */ + the Control modifier. May be any of the modifier lisp symbols. */ Lisp_Object ns_control_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Function modifer (laptops). May be any of the modifier lisp symbols. */ + the Function modifier (laptops). May be any of the modifier lisp symbols. */ Lisp_Object ns_function_modifier; /* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */ -- cgit v1.2.1 From 7163badd35f9dc49dc5c0a26d2c037f8d4fb5ee7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 12 Oct 2010 20:05:22 -0700 Subject: * lisp/mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org. --- lisp/ChangeLog | 4 ++++ lisp/mail/emacsbug.el | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1084d601706..b4878cde2c1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-10-13 Glenn Morris + + * mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org. + 2010-10-12 Juanma Barranquero * international/mule.el (define-coding-system): diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 5dddf00fd71..373e2231e94 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -134,11 +134,11 @@ Prompts for bug subject. Leaves you in a mail buffer." (overlay-put (make-overlay pos (point)) 'face 'highlight)) (insert " if possible, because the Emacs maintainers usually do not have translators to read other languages for them.\n\n") - (insert (format "Your bug report will be posted to the %s mailing list" + (insert (format "Your report will be posted to the %s mailing list" reporting-address)) ;; Nowadays all bug reports end up there. ;;; (if pretest-p (insert ".\n\n") - (insert ",\nand to the gnu.emacs.bug news group.\n\n")) + (insert "\nand the gnu.emacs.bug news group, and at http://debbugs.gnu.org.\n\n")) (insert "Please describe exactly what actions triggered the bug\n" "and the precise symptoms of the bug. If you can, give\n" @@ -337,5 +337,4 @@ and send the mail again%s." (provide 'emacsbug) -;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 ;;; emacsbug.el ends here -- cgit v1.2.1 From 9fa828240d621736a61f5938f78cc98805fdcf56 Mon Sep 17 00:00:00 2001 From: Damyan Pepper Date: Wed, 13 Oct 2010 16:07:28 +0200 Subject: Fix handling of font properties on Windows (bug#6303). * src/font.c (font_filter_properties): New function, refactored from ftfont_filter_properties. * src/font.h (font_filter_properties): Declare. * src/ftfont.c (ftfont_filter_properties): Use font_filter_properties. * src/w32font.c (w32font_booleans, w32font_non_booleans): New variables. (w32font_filter_properties): New function. (w32font_driver): Add w32font_filter_properties. --- src/ChangeLog | 11 +++++++++++ src/font.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/font.h | 5 +++++ src/ftfont.c | 43 ++++--------------------------------------- src/w32font.c | 21 ++++++++++++++++++++- 5 files changed, 93 insertions(+), 40 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7c1faad6aab..40c0cb231e4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2010-10-13 Damyan Pepper + + Fix handling of font properties on Windows (bug#6303). + * font.c (font_filter_properties): New function, refactored from + ftfont_filter_properties. + * font.h (font_filter_properties): Declare. + * ftfont.c (ftfont_filter_properties): Use font_filter_properties. + * w32font.c (w32font_booleans, w32font_non_booleans): New variables. + (w32font_filter_properties): New function. + (w32font_driver): Add w32font_filter_properties. + 2010-10-12 Juanma Barranquero * font.c (Ffont_variation_glyphs): diff --git a/src/font.c b/src/font.c index c72f189d87f..77f43c81d71 100644 --- a/src/font.c +++ b/src/font.c @@ -3862,6 +3862,59 @@ font_get_frame_data (f, driver) } +/* Sets attributes on a font. Any properties that appear in ALIST and + BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font. + BOOLEAN_PROPERTIES and NON_BOOLEAN_PROPERTIES are NULL-terminated + arrays of strings. This function is intended for use by the font + drivers to implement their specific font_filter_properties. */ +void +font_filter_properties (font, alist, boolean_properties, non_boolean_properties) + Lisp_Object font; + Lisp_Object alist; + const char *boolean_properties[]; + const char *non_boolean_properties[]; +{ + Lisp_Object it; + int i; + + /* Set boolean values to Qt or Qnil */ + for (i = 0; boolean_properties[i] != NULL; ++i) + for (it = alist; ! NILP (it); it = XCDR (it)) + { + Lisp_Object key = XCAR (XCAR (it)); + Lisp_Object val = XCDR (XCAR (it)); + char *keystr = SDATA (SYMBOL_NAME (key)); + + if (strcmp (boolean_properties[i], keystr) == 0) + { + const char *str = INTEGERP (val) ? (XINT (val) ? "true" : "false") + : SYMBOLP (val) ? (const char *) SDATA (SYMBOL_NAME (val)) + : "true"; + + if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0 + || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0 + || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0 + || strcmp ("Off", str) == 0) + val = Qnil; + else + val = Qt; + + Ffont_put (font, key, val); + } + } + + for (i = 0; non_boolean_properties[i] != NULL; ++i) + for (it = alist; ! NILP (it); it = XCDR (it)) + { + Lisp_Object key = XCAR (XCAR (it)); + Lisp_Object val = XCDR (XCAR (it)); + char *keystr = SDATA (SYMBOL_NAME (key)); + if (strcmp (non_boolean_properties[i], keystr) == 0) + Ffont_put (font, key, val); + } +} + + /* Return the font used to draw character C by FACE at buffer position POS in window W. If STRING is non-nil, it is a string containing C at index POS. If C is negative, get C from the current buffer or diff --git a/src/font.h b/src/font.h index 96227ffe40b..14b1abc4de8 100644 --- a/src/font.h +++ b/src/font.h @@ -814,6 +814,11 @@ extern int font_put_frame_data P_ ((FRAME_PTR f, extern void *font_get_frame_data P_ ((FRAME_PTR f, struct font_driver *driver)); +extern void font_filter_properties (Lisp_Object font, + Lisp_Object alist, + const char *boolean_properties[], + const char *non_boolean_properties[]); + #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; #endif /* HAVE_FREETYPE */ diff --git a/src/ftfont.c b/src/ftfont.c index 33a96143fd0..4699c74470f 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -88,7 +88,7 @@ static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object, enum ftfont_cache_for)); static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist)); - + Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) @@ -264,7 +264,7 @@ ftfont_pattern_entity (p, extra) else { /* As this font is not scalable, parhaps this is a BDF or PCF - font. */ + font. */ FT_Face ft_face; ASET (entity, FONT_ADSTYLE_INDEX, get_adstyle_property (p)); @@ -2113,7 +2113,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment) return to; } -static int +static int ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in, int from, int to) { @@ -2681,42 +2681,7 @@ ftfont_filter_properties (font, alist) Lisp_Object font; Lisp_Object alist; { - Lisp_Object it; - int i; - - /* Set boolean values to Qt or Qnil */ - for (i = 0; ftfont_booleans[i] != NULL; ++i) - for (it = alist; ! NILP (it); it = XCDR (it)) - { - Lisp_Object key = XCAR (XCAR (it)); - Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); - - if (strcmp (ftfont_booleans[i], keystr) == 0) - { - char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL; - if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false"; - if (str == NULL) str = "true"; - - val = Qt; - if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0 - || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0 - || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0 - || strcmp ("Off", str) == 0) - val = Qnil; - Ffont_put (font, key, val); - } - } - - for (i = 0; ftfont_non_booleans[i] != NULL; ++i) - for (it = alist; ! NILP (it); it = XCDR (it)) - { - Lisp_Object key = XCAR (XCAR (it)); - Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); - if (strcmp (ftfont_non_booleans[i], keystr) == 0) - Ffont_put (font, key, val); - } + font_filter_properties (font, alist, ftfont_booleans, ftfont_non_booleans); } diff --git a/src/w32font.c b/src/w32font.c index a07762e970f..e38e1a56fb8 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -2446,6 +2446,25 @@ in the font selection dialog. */) return DECODE_SYSTEM (build_string (buf)); } +static const char *w32font_booleans [] = { + NULL, +}; + +static const char *w32font_non_booleans [] = { + ":script", + ":antialias", + ":style", + NULL, +}; + +static void +w32font_filter_properties (font, alist) + Lisp_Object font; + Lisp_Object alist; +{ + font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans); +} + struct font_driver w32font_driver = { 0, /* Qgdi */ @@ -2475,7 +2494,7 @@ struct font_driver w32font_driver = NULL, /* shape */ NULL, /* check */ NULL, /* get_variation_glyphs */ - NULL, /* filter_properties */ + w32font_filter_properties, }; -- cgit v1.2.1 From 7ca9cfdaabe5c7dcc151f5da19b1fc7fd2b703e6 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 14 Oct 2010 11:03:25 +0900 Subject: (ps-mule-begin-job): Fix for the case that only ENCODING is set in a font-spec (bug#7197). --- lisp/ChangeLog | 7 +++++++ lisp/ps-mule.el | 50 ++++++++++++++++++++------------------------------ 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3275116a9b..bbb1baf5d6f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-10-14 Kenichi Handa + + * ps-mule.el (ps-mule-font-spec-list): Delete it. Not used + anymore. + (ps-mule-begin-job): Fix for the case that only ENCODING is set in + a font-spec (bug#7197). + 2010-10-10 Jan Djärv * term/ns-win.el (ns-right-alternate-modifier): New defvar. diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index 51c4cc20bec..0fcb6dff79b 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -319,31 +319,19 @@ by `ps-font-family' and `ps-header-font-family'. See also `ps-mule-font-info-database-bdf'.") -(defvar ps-mule-font-spec-list nil - "Array of FONT-SPEC lists for each font type. - -Elements are for `normal' font, `bold' font, `italic' font, and -`bold-italic' font in this order. - -Each element is a list of FONT-SPEC which has this form: - - (ID CHARSET (FONT-SRC FONT-NAME ENCODING) EXTRA-DATA) - -Where - -ID is a number for this FONT-SPEC and is unique in the list. - -CHARSET, FONT-SRC, FONT-NAME, ENCODING are the same as those in -`ps-mule-font-info-database' (which see). - -EXTRA-DATA is a data attached by external libraries. - -Each list is ordered by the current charset priorities. - -This variable is setup by `ps-mule-begin-job' from -`ps-mule-font-info-database'.") - ;; Functions to access each element of FONT-SPEC. +;; +;; FONT-SPEC is a vector of this form: +;; [ID CHARSET FONT-ID FONT-SRC FONT-NAME ENCODING BYTES EXTRA-DATA] +;; Where +;; +;; ID is an identification number for this FONT-SPEC and is unique in the list. +;; +;; CHARSET, FONT-SRC, FONT-NAME, ENCODING, and BYTES are the same as those in +;; `ps-mule-font-info-database' (which see). +;; +;; EXTRA-DATA is a data attached by external libraries. + (defsubst ps-mule-font-spec-id (font-spec) (aref font-spec 0)) (defsubst ps-mule-font-spec-charset (font-spec) (aref font-spec 1)) (defsubst ps-mule-font-spec-font-id (font-spec) (aref font-spec 2)) @@ -1043,7 +1031,7 @@ It checks if all multi-byte characters in the region are printable or not." (if (and (not (find-composition from to)) (save-excursion (goto-char from) - (= (skip-chars-forward "\x00-\xFF" to) to))) + (= (skip-chars-forward "\x00-\x7F" to) to))) ;; All characters can be printed by normal PostScript fonts. (setq ps-basic-plot-string-function 'ps-basic-plot-string ps-encode-header-string-function 'identity) @@ -1085,17 +1073,19 @@ It checks if all multi-byte characters in the region are printable or not." (setq font-info-list (cons font-info font-info-list)))) (setq font-info-list (nreverse font-info-list))) + ;; Now font-info-list is an alist ordered by charset priority. ;; Store FONT-SPECs in each element of font-spec-alist. (dolist (font-info font-info-list) (let ((font-spec-vec (make-vector 4 nil)) (charset (car font-info)) - encoding font-spec) + encoding bytes font-spec) (dolist (e (cdr font-info)) - (setq encoding (or (nth 3 e) charset) - font-spec (vector id-max charset font-id + (setq encoding (nth 3 e) bytes (nth 4 e)) + (unless encoding + (setq encoding charset bytes (charset-dimension charset))) + (setq font-spec (vector id-max charset font-id (nth 1 e) (nth 2 e) encoding - (or (nth 4 e) (charset-dimension encoding)) - nil) + (or bytes 1) nil) id-max (1+ id-max)) (if (ps-mule-check-font font-spec) (aset font-spec-vec -- cgit v1.2.1 From 9650fc61909f4b0b142770b269d1905a41aa672d Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 14 Oct 2010 13:23:36 +0900 Subject: mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and just show an error message (bug#7165). --- lisp/ChangeLog | 3 +++ lisp/mail/rmail.el | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 793bb4e17e9..f6d3555975e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-10-14 Kenichi Handa + * mail/rmail.el (rmail-show-message-1): Catch an error of + base64-decode-region and just show an error message (bug#7165). + * ps-mule.el (ps-mule-font-spec-list): Delete it. Not used anymore. (ps-mule-begin-job): Fix for the case that only ENCODING is set in diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index fa0b7bef207..3ab87fa21f7 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -2742,7 +2742,9 @@ The current mail message becomes the message displayed." nil t 'unibyte) (message "Malformed MIME quoted-printable message"))) ((and (string= character-coding "base64") is-text-message) - (base64-decode-region (point-min) (point-max))) + (condition-case err + (base64-decode-region (point-min) (point-max)) + (error (message "%s" (cdr err))))) ((eq character-coding 'uuencode) (error "uuencoded messages are not supported yet")) (t)) -- cgit v1.2.1 From 9d4f32e88a1b642070f0adb41df04a0846c31970 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Oct 2010 14:25:35 +0200 Subject: src/w32*.c: Whitespace fixes and typos. --- src/w32.c | 290 ++++++++++++++++++++++++++--------------------------- src/w32console.c | 28 +++--- src/w32fns.c | 7 +- src/w32font.c | 18 ++-- src/w32heap.c | 2 +- src/w32inevt.c | 4 +- src/w32menu.c | 21 ++-- src/w32proc.c | 37 ++++--- src/w32select.c | 38 +++---- src/w32term.c | 32 +++--- src/w32uniscribe.c | 15 +-- src/w32xfns.c | 5 +- 12 files changed, 248 insertions(+), 249 deletions(-) diff --git a/src/w32.c b/src/w32.c index 2ff344abd65..d96abd346f5 100644 --- a/src/w32.c +++ b/src/w32.c @@ -315,8 +315,8 @@ is_windows_9x () if (g_b_init_is_windows_9x == 0) { g_b_init_is_windows_9x = 1; - ZeroMemory(&os_ver, sizeof(OSVERSIONINFO)); - os_ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + ZeroMemory (&os_ver, sizeof (OSVERSIONINFO)); + os_ver.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); if (GetVersionEx (&os_ver)) { s_b_ret = (os_ver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS); @@ -334,7 +334,7 @@ w32_get_internal_run_time () if (get_process_times_fn) { FILETIME create, exit, kernel, user; - HANDLE proc = GetCurrentProcess(); + HANDLE proc = GetCurrentProcess (); if ((*get_process_times_fn) (proc, &create, &exit, &kernel, &user)) { LARGE_INTEGER user_int, kernel_int, total; @@ -367,10 +367,10 @@ w32_get_internal_run_time () /* ** The wrapper functions ** */ -BOOL WINAPI open_process_token ( - HANDLE ProcessHandle, - DWORD DesiredAccess, - PHANDLE TokenHandle) +BOOL WINAPI +open_process_token (HANDLE ProcessHandle, + DWORD DesiredAccess, + PHANDLE TokenHandle) { static OpenProcessToken_Proc s_pfn_Open_Process_Token = NULL; HMODULE hm_advapi32 = NULL; @@ -397,12 +397,12 @@ BOOL WINAPI open_process_token ( ); } -BOOL WINAPI get_token_information ( - HANDLE TokenHandle, - TOKEN_INFORMATION_CLASS TokenInformationClass, - LPVOID TokenInformation, - DWORD TokenInformationLength, - PDWORD ReturnLength) +BOOL WINAPI +get_token_information (HANDLE TokenHandle, + TOKEN_INFORMATION_CLASS TokenInformationClass, + LPVOID TokenInformation, + DWORD TokenInformationLength, + PDWORD ReturnLength) { static GetTokenInformation_Proc s_pfn_Get_Token_Information = NULL; HMODULE hm_advapi32 = NULL; @@ -431,14 +431,14 @@ BOOL WINAPI get_token_information ( ); } -BOOL WINAPI lookup_account_sid ( - LPCTSTR lpSystemName, - PSID Sid, - LPTSTR Name, - LPDWORD cbName, - LPTSTR DomainName, - LPDWORD cbDomainName, - PSID_NAME_USE peUse) +BOOL WINAPI +lookup_account_sid (LPCTSTR lpSystemName, + PSID Sid, + LPTSTR Name, + LPDWORD cbName, + LPTSTR DomainName, + LPDWORD cbDomainName, + PSID_NAME_USE peUse) { static LookupAccountSid_Proc s_pfn_Lookup_Account_Sid = NULL; HMODULE hm_advapi32 = NULL; @@ -469,8 +469,8 @@ BOOL WINAPI lookup_account_sid ( ); } -PSID_IDENTIFIER_AUTHORITY WINAPI get_sid_identifier_authority ( - PSID pSid) +PSID_IDENTIFIER_AUTHORITY WINAPI +get_sid_identifier_authority (PSID pSid) { static GetSidIdentifierAuthority_Proc s_pfn_Get_Sid_Identifier_Authority = NULL; HMODULE hm_advapi32 = NULL; @@ -493,9 +493,8 @@ PSID_IDENTIFIER_AUTHORITY WINAPI get_sid_identifier_authority ( return (s_pfn_Get_Sid_Identifier_Authority (pSid)); } -PDWORD WINAPI get_sid_sub_authority ( - PSID pSid, - DWORD n) +PDWORD WINAPI +get_sid_sub_authority (PSID pSid, DWORD n) { static GetSidSubAuthority_Proc s_pfn_Get_Sid_Sub_Authority = NULL; static DWORD zero = 0U; @@ -519,8 +518,8 @@ PDWORD WINAPI get_sid_sub_authority ( return (s_pfn_Get_Sid_Sub_Authority (pSid, n)); } -PUCHAR WINAPI get_sid_sub_authority_count ( - PSID pSid) +PUCHAR WINAPI +get_sid_sub_authority_count (PSID pSid) { static GetSidSubAuthorityCount_Proc s_pfn_Get_Sid_Sub_Authority_Count = NULL; static UCHAR zero = 0U; @@ -544,12 +543,12 @@ PUCHAR WINAPI get_sid_sub_authority_count ( return (s_pfn_Get_Sid_Sub_Authority_Count (pSid)); } -BOOL WINAPI get_file_security ( - LPCTSTR lpFileName, - SECURITY_INFORMATION RequestedInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD nLength, - LPDWORD lpnLengthNeeded) +BOOL WINAPI +get_file_security (LPCTSTR lpFileName, + SECURITY_INFORMATION RequestedInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD nLength, + LPDWORD lpnLengthNeeded) { static GetFileSecurity_Proc s_pfn_Get_File_Security = NULL; HMODULE hm_advapi32 = NULL; @@ -574,10 +573,10 @@ BOOL WINAPI get_file_security ( lpnLengthNeeded)); } -BOOL WINAPI get_security_descriptor_owner ( - PSECURITY_DESCRIPTOR pSecurityDescriptor, - PSID *pOwner, - LPBOOL lpbOwnerDefaulted) +BOOL WINAPI +get_security_descriptor_owner (PSECURITY_DESCRIPTOR pSecurityDescriptor, + PSID *pOwner, + LPBOOL lpbOwnerDefaulted) { static GetSecurityDescriptorOwner_Proc s_pfn_Get_Security_Descriptor_Owner = NULL; HMODULE hm_advapi32 = NULL; @@ -601,10 +600,10 @@ BOOL WINAPI get_security_descriptor_owner ( lpbOwnerDefaulted)); } -BOOL WINAPI get_security_descriptor_group ( - PSECURITY_DESCRIPTOR pSecurityDescriptor, - PSID *pGroup, - LPBOOL lpbGroupDefaulted) +BOOL WINAPI +get_security_descriptor_group (PSECURITY_DESCRIPTOR pSecurityDescriptor, + PSID *pGroup, + LPBOOL lpbGroupDefaulted) { static GetSecurityDescriptorGroup_Proc s_pfn_Get_Security_Descriptor_Group = NULL; HMODULE hm_advapi32 = NULL; @@ -628,8 +627,8 @@ BOOL WINAPI get_security_descriptor_group ( lpbGroupDefaulted)); } -BOOL WINAPI is_valid_sid ( - PSID sid) +BOOL WINAPI +is_valid_sid (PSID sid) { static IsValidSid_Proc s_pfn_Is_Valid_Sid = NULL; HMODULE hm_advapi32 = NULL; @@ -652,9 +651,8 @@ BOOL WINAPI is_valid_sid ( return (s_pfn_Is_Valid_Sid (sid)); } -BOOL WINAPI equal_sid ( - PSID sid1, - PSID sid2) +BOOL WINAPI +equal_sid (PSID sid1, PSID sid2) { static EqualSid_Proc s_pfn_Equal_Sid = NULL; HMODULE hm_advapi32 = NULL; @@ -677,8 +675,8 @@ BOOL WINAPI equal_sid ( return (s_pfn_Equal_Sid (sid1, sid2)); } -DWORD WINAPI get_length_sid ( - PSID sid) +DWORD WINAPI +get_length_sid (PSID sid) { static GetLengthSid_Proc s_pfn_Get_Length_Sid = NULL; HMODULE hm_advapi32 = NULL; @@ -701,10 +699,8 @@ DWORD WINAPI get_length_sid ( return (s_pfn_Get_Length_Sid (sid)); } -BOOL WINAPI copy_sid ( - DWORD destlen, - PSID dest, - PSID src) +BOOL WINAPI +copy_sid (DWORD destlen, PSID dest, PSID src) { static CopySid_Proc s_pfn_Copy_Sid = NULL; HMODULE hm_advapi32 = NULL; @@ -733,8 +729,8 @@ BOOL WINAPI copy_sid ( supported in Windows NT / 2k / XP */ -void WINAPI get_native_system_info ( - LPSYSTEM_INFO lpSystemInfo) +void WINAPI +get_native_system_info (LPSYSTEM_INFO lpSystemInfo) { static GetNativeSystemInfo_Proc s_pfn_Get_Native_System_Info = NULL; if (is_windows_9x () != TRUE) @@ -753,10 +749,10 @@ void WINAPI get_native_system_info ( lpSystemInfo->dwNumberOfProcessors = -1; } -BOOL WINAPI get_system_times( - LPFILETIME lpIdleTime, - LPFILETIME lpKernelTime, - LPFILETIME lpUserTime) +BOOL WINAPI +get_system_times (LPFILETIME lpIdleTime, + LPFILETIME lpKernelTime, + LPFILETIME lpUserTime) { static GetSystemTimes_Proc s_pfn_Get_System_times = NULL; if (is_windows_9x () == TRUE) @@ -1691,7 +1687,7 @@ init_environment (char ** argv) for (p = modname; *p; p++) if (*p == '\\') *p = '/'; - _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname); + _snprintf (buf, sizeof (buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); } /* Handle running emacs from the build directory: src/oo-spd/i386/ */ @@ -1715,7 +1711,7 @@ init_environment (char ** argv) for (p = modname; *p; p++) if (*p == '\\') *p = '/'; - _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname); + _snprintf (buf, sizeof (buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); } } @@ -1743,12 +1739,12 @@ init_environment (char ** argv) char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE]; if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1)); + ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof (buf1)); else if (dwType == REG_SZ) strcpy (buf1, lpval); if (dwType == REG_EXPAND_SZ || dwType == REG_SZ) { - _snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, + _snprintf (buf2, sizeof (buf2)-1, "%s=%s", env_vars[i].name, buf1); _putenv (strdup (buf2)); } @@ -2091,7 +2087,7 @@ GetCachedVolumeInformation (char * root_dir) involve network access, and so is extremely quick). */ /* Map drive letter to UNC if remote. */ - if ( isalpha( root_dir[0] ) && !fixed[ DRIVE_INDEX( root_dir[0] ) ] ) + if ( isalpha (root_dir[0]) && !fixed[ DRIVE_INDEX (root_dir[0]) ] ) { char remote_name[ 256 ]; char drive[3] = { root_dir[0], ':' }; @@ -2490,8 +2486,8 @@ open_unc_volume (const char *path) nr.lpComment = NULL; nr.lpProvider = NULL; - result = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, - RESOURCEUSAGE_CONNECTABLE, &nr, &henum); + result = WNetOpenEnum (RESOURCE_GLOBALNET, RESOURCETYPE_DISK, + RESOURCEUSAGE_CONNECTABLE, &nr, &henum); if (result == NO_ERROR) return henum; @@ -2667,7 +2663,7 @@ sys_creat (const char * path, int mode) } FILE * -sys_fopen(const char * path, const char * mode) +sys_fopen (const char * path, const char * mode) { int fd; int oflag; @@ -2754,7 +2750,7 @@ sys_link (const char * old, const char * new) data.wid.dwStreamId = BACKUP_LINK; data.wid.dwStreamAttributes = 0; - data.wid.Size.LowPart = wlen * sizeof(WCHAR); + data.wid.Size.LowPart = wlen * sizeof (WCHAR); data.wid.Size.HighPart = 0; data.wid.dwStreamNameSize = 0; @@ -2980,7 +2976,7 @@ convert_time (FILETIME ft) if (!init) { - initialize_utc_base(); + initialize_utc_base (); init = 1; } @@ -3167,7 +3163,7 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname, char name[UNLEN+1]; DWORD name_len = sizeof (name); char domain[1024]; - DWORD domain_len = sizeof(domain); + DWORD domain_len = sizeof (domain); char *mp = NULL; int use_dflt = 0; int result; @@ -3213,10 +3209,9 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname, } static void -get_file_owner_and_group ( - PSECURITY_DESCRIPTOR psd, - const char *fname, - struct stat *st) +get_file_owner_and_group (PSECURITY_DESCRIPTOR psd, + const char *fname, + struct stat *st) { int dflt_usr = 0, dflt_grp = 0; @@ -3642,9 +3637,8 @@ utime (const char *name, struct utimbuf *times) /* Helper wrapper functions. */ -HANDLE WINAPI create_toolhelp32_snapshot( - DWORD Flags, - DWORD Ignored) +HANDLE WINAPI +create_toolhelp32_snapshot (DWORD Flags, DWORD Ignored) { static CreateToolhelp32Snapshot_Proc s_pfn_Create_Toolhelp32_Snapshot = NULL; @@ -3662,9 +3656,8 @@ HANDLE WINAPI create_toolhelp32_snapshot( return (s_pfn_Create_Toolhelp32_Snapshot (Flags, Ignored)); } -BOOL WINAPI process32_first( - HANDLE hSnapshot, - LPPROCESSENTRY32 lppe) +BOOL WINAPI +process32_first (HANDLE hSnapshot, LPPROCESSENTRY32 lppe) { static Process32First_Proc s_pfn_Process32_First = NULL; @@ -3682,9 +3675,8 @@ BOOL WINAPI process32_first( return (s_pfn_Process32_First (hSnapshot, lppe)); } -BOOL WINAPI process32_next( - HANDLE hSnapshot, - LPPROCESSENTRY32 lppe) +BOOL WINAPI +process32_next (HANDLE hSnapshot, LPPROCESSENTRY32 lppe) { static Process32Next_Proc s_pfn_Process32_Next = NULL; @@ -3702,11 +3694,11 @@ BOOL WINAPI process32_next( return (s_pfn_Process32_Next (hSnapshot, lppe)); } -BOOL WINAPI open_thread_token ( - HANDLE ThreadHandle, - DWORD DesiredAccess, - BOOL OpenAsSelf, - PHANDLE TokenHandle) +BOOL WINAPI +open_thread_token (HANDLE ThreadHandle, + DWORD DesiredAccess, + BOOL OpenAsSelf, + PHANDLE TokenHandle) { static OpenThreadToken_Proc s_pfn_Open_Thread_Token = NULL; HMODULE hm_advapi32 = NULL; @@ -3736,8 +3728,8 @@ BOOL WINAPI open_thread_token ( ); } -BOOL WINAPI impersonate_self ( - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +BOOL WINAPI +impersonate_self (SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { static ImpersonateSelf_Proc s_pfn_Impersonate_Self = NULL; HMODULE hm_advapi32 = NULL; @@ -3759,7 +3751,8 @@ BOOL WINAPI impersonate_self ( return s_pfn_Impersonate_Self (ImpersonationLevel); } -BOOL WINAPI revert_to_self (void) +BOOL WINAPI +revert_to_self (void) { static RevertToSelf_Proc s_pfn_Revert_To_Self = NULL; HMODULE hm_advapi32 = NULL; @@ -3781,10 +3774,10 @@ BOOL WINAPI revert_to_self (void) return s_pfn_Revert_To_Self (); } -BOOL WINAPI get_process_memory_info ( - HANDLE h_proc, - PPROCESS_MEMORY_COUNTERS mem_counters, - DWORD bufsize) +BOOL WINAPI +get_process_memory_info (HANDLE h_proc, + PPROCESS_MEMORY_COUNTERS mem_counters, + DWORD bufsize) { static GetProcessMemoryInfo_Proc s_pfn_Get_Process_Memory_Info = NULL; HMODULE hm_psapi = NULL; @@ -3807,10 +3800,8 @@ BOOL WINAPI get_process_memory_info ( return s_pfn_Get_Process_Memory_Info (h_proc, mem_counters, bufsize); } -BOOL WINAPI get_process_working_set_size ( - HANDLE h_proc, - DWORD *minrss, - DWORD *maxrss) +BOOL WINAPI +get_process_working_set_size (HANDLE h_proc, DWORD *minrss, DWORD *maxrss) { static GetProcessWorkingSetSize_Proc s_pfn_Get_Process_Working_Set_Size = NULL; @@ -3833,8 +3824,8 @@ BOOL WINAPI get_process_working_set_size ( return s_pfn_Get_Process_Working_Set_Size (h_proc, minrss, maxrss); } -BOOL WINAPI global_memory_status ( - MEMORYSTATUS *buf) +BOOL WINAPI +global_memory_status (MEMORYSTATUS *buf) { static GlobalMemoryStatus_Proc s_pfn_Global_Memory_Status = NULL; @@ -3856,8 +3847,8 @@ BOOL WINAPI global_memory_status ( return s_pfn_Global_Memory_Status (buf); } -BOOL WINAPI global_memory_status_ex ( - MEMORY_STATUS_EX *buf) +BOOL WINAPI +global_memory_status_ex (MEMORY_STATUS_EX *buf) { static GlobalMemoryStatusEx_Proc s_pfn_Global_Memory_Status_Ex = NULL; @@ -3992,8 +3983,8 @@ process_times (h_proc, ctime, etime, stime, utime, ttime, pcpu) if (!h_proc || !get_process_times_fn - || !(*get_process_times_fn)(h_proc, &ft_creation, &ft_exit, - &ft_kernel, &ft_user)) + || !(*get_process_times_fn) (h_proc, &ft_creation, &ft_exit, + &ft_kernel, &ft_user)) return 0; GetSystemTimeAsFileTime (&ft_current); @@ -4435,34 +4426,34 @@ init_winsock (int load_now) if ((pfn_##fn = (void *) GetProcAddress (winsock_lib, #fn)) == NULL) \ goto fail; - LOAD_PROC( WSAStartup ); - LOAD_PROC( WSASetLastError ); - LOAD_PROC( WSAGetLastError ); - LOAD_PROC( WSAEventSelect ); - LOAD_PROC( WSACreateEvent ); - LOAD_PROC( WSACloseEvent ); - LOAD_PROC( socket ); - LOAD_PROC( bind ); - LOAD_PROC( connect ); - LOAD_PROC( ioctlsocket ); - LOAD_PROC( recv ); - LOAD_PROC( send ); - LOAD_PROC( closesocket ); - LOAD_PROC( shutdown ); - LOAD_PROC( htons ); - LOAD_PROC( ntohs ); - LOAD_PROC( inet_addr ); - LOAD_PROC( gethostname ); - LOAD_PROC( gethostbyname ); - LOAD_PROC( getservbyname ); - LOAD_PROC( getpeername ); - LOAD_PROC( WSACleanup ); - LOAD_PROC( setsockopt ); - LOAD_PROC( listen ); - LOAD_PROC( getsockname ); - LOAD_PROC( accept ); - LOAD_PROC( recvfrom ); - LOAD_PROC( sendto ); + LOAD_PROC (WSAStartup); + LOAD_PROC (WSASetLastError); + LOAD_PROC (WSAGetLastError); + LOAD_PROC (WSAEventSelect); + LOAD_PROC (WSACreateEvent); + LOAD_PROC (WSACloseEvent); + LOAD_PROC (socket); + LOAD_PROC (bind); + LOAD_PROC (connect); + LOAD_PROC (ioctlsocket); + LOAD_PROC (recv); + LOAD_PROC (send); + LOAD_PROC (closesocket); + LOAD_PROC (shutdown); + LOAD_PROC (htons); + LOAD_PROC (ntohs); + LOAD_PROC (inet_addr); + LOAD_PROC (gethostname); + LOAD_PROC (gethostbyname); + LOAD_PROC (getservbyname); + LOAD_PROC (getpeername); + LOAD_PROC (WSACleanup); + LOAD_PROC (setsockopt); + LOAD_PROC (listen); + LOAD_PROC (getsockname); + LOAD_PROC (accept); + LOAD_PROC (recvfrom); + LOAD_PROC (sendto); #undef LOAD_PROC /* specify version 1.1 of winsock */ @@ -4607,7 +4598,7 @@ struct { }; char * -sys_strerror(int error_no) +sys_strerror (int error_no) { int i; static char unknown_msg[40]; @@ -4619,7 +4610,7 @@ sys_strerror(int error_no) if (_wsa_errlist[i].errnum == error_no) return _wsa_errlist[i].msg; - sprintf(unknown_msg, "Unidentified error: %d", error_no); + sprintf (unknown_msg, "Unidentified error: %d", error_no); return unknown_msg; } @@ -4638,7 +4629,7 @@ sys_strerror(int error_no) int socket_to_fd (SOCKET s); int -sys_socket(int af, int type, int protocol) +sys_socket (int af, int type, int protocol) { SOCKET s; @@ -4841,7 +4832,7 @@ sys_gethostname (char * name, int namelen) } struct hostent * -sys_gethostbyname(const char * name) +sys_gethostbyname (const char * name) { struct hostent * host; @@ -4859,7 +4850,7 @@ sys_gethostbyname(const char * name) } struct servent * -sys_getservbyname(const char * name, const char * proto) +sys_getservbyname (const char * name, const char * proto) { struct servent * serv; @@ -5014,7 +5005,7 @@ sys_accept (int s, struct sockaddr * addr, int * addrlen) int sys_recvfrom (int s, char * buf, int len, int flags, - struct sockaddr * from, int * fromlen) + struct sockaddr * from, int * fromlen) { if (winsock_lib == NULL) { @@ -5075,7 +5066,7 @@ fcntl (int s, int cmd, int options) unsigned long nblock = 1; int rc = pfn_ioctlsocket (SOCK_HANDLE (s), FIONBIO, &nblock); if (rc == SOCKET_ERROR) - set_errno(); + set_errno (); /* Keep track of the fact that we set this to non-blocking. */ fd_info[s].flags |= FILE_NDELAY; return rc; @@ -5512,8 +5503,8 @@ sys_read (int fd, char * buffer, unsigned int count) int res = pfn_recv (SOCK_HANDLE (fd), buffer, count, 0); if (res == SOCKET_ERROR) { - DebPrint(("sys_read.recv failed with error %d on socket %ld\n", - pfn_WSAGetLastError (), SOCK_HANDLE (fd))); + DebPrint (("sys_read.recv failed with error %d on socket %ld\n", + pfn_WSAGetLastError (), SOCK_HANDLE (fd))); set_errno (); return -1; } @@ -5669,8 +5660,8 @@ sys_write (int fd, const void * buffer, unsigned int count) if (nchars == SOCKET_ERROR) { - DebPrint(("sys_write.send failed with error %d on socket %ld\n", - pfn_WSAGetLastError (), SOCK_HANDLE (fd))); + DebPrint (("sys_write.send failed with error %d on socket %ld\n", + pfn_WSAGetLastError (), SOCK_HANDLE (fd))); set_errno (); } } @@ -5857,7 +5848,8 @@ init_ntproc () shutdown_handler ensures that buffers' autosave files are up to date when the user logs off, or the system shuts down. */ -BOOL WINAPI shutdown_handler(DWORD type) +BOOL WINAPI +shutdown_handler (DWORD type) { /* Ctrl-C and Ctrl-Break are already suppressed, so don't handle them. */ if (type == CTRL_CLOSE_EVENT /* User closes console window. */ @@ -5916,14 +5908,15 @@ globals_of_w32 () console apps. This actually applies to Emacs in both console and GUI modes, since we had to fool windows into thinking emacs is a console application to get console mode to work. */ - SetConsoleCtrlHandler(shutdown_handler, TRUE); + SetConsoleCtrlHandler (shutdown_handler, TRUE); /* "None" is the default group name on standalone workstations. */ strcpy (dflt_group_name, "None"); } /* For make-serial-process */ -int serial_open (char *port) +int +serial_open (char *port) { HANDLE hnd; child_process *cp; @@ -5962,8 +5955,7 @@ int serial_open (char *port) /* For serial-process-configure */ void -serial_configure (struct Lisp_Process *p, - Lisp_Object contact) +serial_configure (struct Lisp_Process *p, Lisp_Object contact) { Lisp_Object childp2 = Qnil; Lisp_Object tem = Qnil; diff --git a/src/w32console.c b/src/w32console.c index c10f2181e7d..303299898d9 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -286,7 +286,7 @@ w32con_insert_glyphs (struct frame *f, register struct glyph *start, register in } } -extern unsigned char *encode_terminal_code P_ ((struct glyph *, int, +extern unsigned char *encode_terminal_code P_ ((struct glyph *, int, struct coding_system *)); static void @@ -438,7 +438,7 @@ w32con_reset_terminal_modes (struct terminal *t) FillConsoleOutputCharacter (cur_screen, ' ', n, dest, &r); /* Now that the screen is clear, put the cursor at the top. */ SetConsoleCursorPosition (cur_screen, dest); - + #ifdef USE_SEPARATE_SCREEN SetConsoleActiveScreenBuffer (prev_screen); #else @@ -562,19 +562,19 @@ initialize_w32_display (struct terminal *term) term->rif = 0; /* No window based redisplay on the console. */ term->cursor_to_hook = w32con_move_cursor; - term->raw_cursor_to_hook = w32con_move_cursor; - term->clear_to_end_hook = w32con_clear_to_end; - term->clear_frame_hook = w32con_clear_frame; + term->raw_cursor_to_hook = w32con_move_cursor; + term->clear_to_end_hook = w32con_clear_to_end; + term->clear_frame_hook = w32con_clear_frame; term->clear_end_of_line_hook = w32con_clear_end_of_line; - term->ins_del_lines_hook = w32con_ins_del_lines; - term->insert_glyphs_hook = w32con_insert_glyphs; - term->write_glyphs_hook = w32con_write_glyphs; - term->delete_glyphs_hook = w32con_delete_glyphs; + term->ins_del_lines_hook = w32con_ins_del_lines; + term->insert_glyphs_hook = w32con_insert_glyphs; + term->write_glyphs_hook = w32con_write_glyphs; + term->delete_glyphs_hook = w32con_delete_glyphs; term->ring_bell_hook = w32_sys_ring_bell; - term->reset_terminal_modes_hook = w32con_reset_terminal_modes; + term->reset_terminal_modes_hook = w32con_reset_terminal_modes; term->set_terminal_modes_hook = w32con_set_terminal_modes; - term->set_terminal_window_hook = w32con_set_terminal_window; - term->update_begin_hook = w32con_update_begin; + term->set_terminal_window_hook = w32con_set_terminal_window; + term->update_begin_hook = w32con_update_begin; term->update_end_hook = w32con_update_end; term->read_socket_hook = w32_console_read_socket; @@ -618,8 +618,8 @@ initialize_w32_display (struct terminal *term) /* Respect setting of LINES and COLUMNS environment variables. */ { - char * lines = getenv("LINES"); - char * columns = getenv("COLUMNS"); + char * lines = getenv ("LINES"); + char * columns = getenv ("COLUMNS"); if (lines != NULL && columns != NULL) { diff --git a/src/w32fns.c b/src/w32fns.c index e27e7fecdc6..61dd8b9ee1f 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -245,7 +245,7 @@ struct MONITOR_INFO }; /* Reportedly, VS 6 does not have this in its headers. */ -#if defined(_MSC_VER) && _MSC_VER < 1300 +#if defined (_MSC_VER) && _MSC_VER < 1300 DECLARE_HANDLE(HMONITOR); #endif @@ -1941,7 +1941,6 @@ x_set_title (f, name, old_name) } } - void x_set_scroll_bar_default_width (f) struct frame *f; { @@ -3169,7 +3168,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam); /* Get buffer size. */ size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0); - buffer = alloca(size); + buffer = alloca (size); size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, size); release_ime_context_fn (hwnd, context); @@ -4007,7 +4006,6 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) return DefWindowProc (hwnd, msg, wParam, lParam); } - /* The most common default return code for handled messages is 0. */ return 0; } @@ -4460,7 +4458,6 @@ This function is an internal primitive--use `make-frame' instead. */) x_default_parameter (f, parameters, Qright_fringe, Qnil, "rightFringe", "RightFringe", RES_TYPE_NUMBER); - /* Init faces before x_default_parameter is called for scroll-bar parameters because that function calls x_set_scroll_bar_width, which calls change_frame_size, which calls Fset_window_buffer, diff --git a/src/w32font.c b/src/w32font.c index e38e1a56fb8..679f17329ab 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -568,7 +568,7 @@ w32font_draw (s, from, to, x, y, with_background) /* Save clip region for later restoration. */ orig_clip = CreateRectRgn (0, 0, 0, 0); - if (!GetClipRgn(s->hdc, orig_clip)) + if (!GetClipRgn (s->hdc, orig_clip)) { DeleteObject (orig_clip); orig_clip = NULL; @@ -1833,7 +1833,7 @@ w32_registry (w32_charset, font_type) return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown; charset = w32_to_x_charset (w32_charset, NULL); - return font_intern_prop (charset, strlen(charset), 1); + return font_intern_prop (charset, strlen (charset), 1); } static int @@ -1847,7 +1847,7 @@ w32_decode_weight (fnweight) if (fnweight >= FW_NORMAL) return 100; if (fnweight >= FW_LIGHT) return 50; if (fnweight >= FW_EXTRALIGHT) return 40; - if (fnweight > FW_THIN) return 20; + if (fnweight > FW_THIN) return 20; return 0; } @@ -1862,7 +1862,7 @@ w32_encode_weight (n) if (n >= 100) return FW_NORMAL; if (n >= 50) return FW_LIGHT; if (n >= 40) return FW_EXTRALIGHT; - if (n >= 20) return FW_THIN; + if (n >= 20) return FW_THIN; return 0; } @@ -1873,9 +1873,9 @@ w32_to_fc_weight (n) int n; { if (n >= FW_EXTRABOLD) return intern ("black"); - if (n >= FW_BOLD) return intern ("bold"); - if (n >= FW_SEMIBOLD) return intern ("demibold"); - if (n >= FW_NORMAL) return intern ("medium"); + if (n >= FW_BOLD) return intern ("bold"); + if (n >= FW_SEMIBOLD) return intern ("demibold"); + if (n >= FW_NORMAL) return intern ("medium"); return intern ("light"); } @@ -1966,7 +1966,6 @@ fill_in_logfont (f, logfont, font_spec) logfont->lfPitchAndFamily = family | DEFAULT_PITCH; } - /* Set pitch based on the spacing property. */ tmp = AREF (font_spec, FONT_SPACING_INDEX); if (INTEGERP (tmp)) @@ -2317,7 +2316,8 @@ w32font_full_name (font, font_obj, pixel_size, name, nbytes) is written. If the buffer is not large enough to contain the name, the function returns -1, otherwise it returns the number of bytes written to FCNAME. */ -static int logfont_to_fcname(font, pointsize, fcname, size) +static int +logfont_to_fcname (font, pointsize, fcname, size) LOGFONT* font; int pointsize; char *fcname; diff --git a/src/w32heap.c b/src/w32heap.c index 440388c6eab..f3e3d3b9b90 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -279,7 +279,7 @@ round_heap (unsigned long align) sbrk (need_to_alloc); } -#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined(USE_CRT_DLL)) +#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined (USE_CRT_DLL)) /* MSVC 4.2 invokes these functions from mainCRTStartup to initialize a heap via HeapCreate. They are normally defined by the runtime, diff --git a/src/w32inevt.c b/src/w32inevt.c index 864b3b3f0bb..3aaad6b016a 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -582,8 +582,8 @@ w32_console_mouse_position (FRAME_PTR *f, *part = 0; SELECTED_FRAME ()->mouse_moved = 0; - XSETINT(*x, movement_pos.X); - XSETINT(*y, movement_pos.Y); + XSETINT (*x, movement_pos.X); + XSETINT (*y, movement_pos.Y); *time = movement_time; UNBLOCK_INPUT; diff --git a/src/w32menu.c b/src/w32menu.c index 73fba8108c6..82536c984b4 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -99,7 +99,7 @@ static int is_simple_dialog P_ ((Lisp_Object)); static Lisp_Object simple_dialog_show P_ ((FRAME_PTR, Lisp_Object, Lisp_Object)); #endif -void w32_free_menu_strings P_((HWND)); +void w32_free_menu_strings P_ ((HWND)); /* This is set nonzero after the user activates the menu bar, and set @@ -1026,7 +1026,7 @@ w32_dialog_show (f, keymaps, title, header, error) Lisp_Object title, header; char **error; { - int i, nb_buttons=0; + int i, nb_buttons = 0; char dialog_name[6]; int menu_item_selection; @@ -1127,7 +1127,7 @@ w32_dialog_show (f, keymaps, title, header, error) /* Frame title: 'Q' = Question, 'I' = Information. Can also have 'E' = Error if, one day, we want a popup for errors. */ - if (NILP(header)) + if (NILP (header)) dialog_name[0] = 'Q'; else dialog_name[0] = 'I'; @@ -1213,7 +1213,8 @@ w32_dialog_show (f, keymaps, title, header, error) anywhere in Emacs that uses the other specific dialog choices that MessageBox provides. */ -static int is_simple_dialog (contents) +static int +is_simple_dialog (contents) Lisp_Object contents; { Lisp_Object options = XCDR (contents); @@ -1249,7 +1250,8 @@ static int is_simple_dialog (contents) return !(CONSP (options)); } -static Lisp_Object simple_dialog_show (f, contents, header) +static Lisp_Object +simple_dialog_show (f, contents, header) FRAME_PTR f; Lisp_Object contents, header; { @@ -1328,7 +1330,6 @@ name_is_separator (name) return (*name == '\0' || start + 2 == name); } - /* Indicate boundary between left and right. */ static int add_left_right_boundary (HMENU menu) @@ -1712,7 +1713,8 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ #endif /* HAVE_MENUS */ } -void syms_of_w32menu () +void +syms_of_w32menu () { globals_of_w32menu (); @@ -1734,9 +1736,10 @@ void syms_of_w32menu () variable initialized is 0 and directly from main when initialized is non zero. */ -void globals_of_w32menu () +void +globals_of_w32menu () { - /* See if Get/SetMenuItemInfo functions are available. */ + /* See if Get/SetMenuItemInfo functions are available. */ HMODULE user32 = GetModuleHandle ("user32.dll"); get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA"); set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA"); diff --git a/src/w32proc.c b/src/w32proc.c index 9d4d58f1230..07ee0300cfb 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -46,7 +46,7 @@ along with GNU Emacs. If not, see . */ #include #ifdef __GNUC__ /* This definition is missing from mingw32 headers. */ -extern BOOL WINAPI IsValidLocale(LCID, DWORD); +extern BOOL WINAPI IsValidLocale (LCID, DWORD); #endif #ifdef HAVE_LANGINFO_CODESET @@ -167,7 +167,7 @@ new_child (void) child_process *cp; DWORD id; - for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--) + for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) if (!CHILD_ACTIVE (cp)) goto Initialise; if (child_proc_count == MAX_CHILDREN) @@ -175,7 +175,7 @@ new_child (void) cp = &child_procs[child_proc_count++]; Initialise: - memset (cp, 0, sizeof(*cp)); + memset (cp, 0, sizeof (*cp)); cp->fd = -1; cp->pid = -1; cp->procinfo.hProcess = NULL; @@ -267,7 +267,7 @@ find_child_pid (DWORD pid) { child_process *cp; - for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--) + for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) if (CHILD_ACTIVE (cp) && pid == cp->pid) return cp; return NULL; @@ -398,7 +398,7 @@ create_child (char *exe, char *cmdline, char *env, int is_gui_app, return TRUE; EH_Fail: - DebPrint (("create_child.CreateProcess failed: %ld\n", GetLastError());); + DebPrint (("create_child.CreateProcess failed: %ld\n", GetLastError ());); return FALSE; } @@ -494,7 +494,7 @@ sys_wait (int *status) } else { - for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--) + for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) /* some child_procs might be sockets; ignore them */ if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess && (cp->fd < 0 || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0)) @@ -891,7 +891,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) escape_char = is_cygnus_app ? '"' : '\\'; } - /* Cygwin apps needs quoting a bit more often */ + /* Cygwin apps needs quoting a bit more often. */ if (escape_char == '"') sepchars = "\r\n\t\f '"; @@ -1241,7 +1241,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, count_children: /* Add handles of child processes. */ nc = 0; - for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--) + for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) /* Some child_procs might be sockets; ignore them. Also some children may have died already, but we haven't finished reading the process output; ignore them too. */ @@ -1719,7 +1719,7 @@ also loaded immediately if not already loaded. If winsock is loaded, the winsock local hostname is returned (since this may be different from the value of `system-name' and should supplant it), otherwise t is returned to indicate winsock support is present. */) - (load_now) + (load_now) Lisp_Object load_now; { int have_winsock; @@ -1797,7 +1797,7 @@ DEFUN ("w32-long-file-name", Fw32_long_file_name, Sw32_long_file_name, doc: /* Return the long file name version of the full path of FILENAME. If FILENAME does not exist, return nil. All path elements in FILENAME are converted to their long names. */) - (filename) + (filename) Lisp_Object filename; { char longname[ MAX_PATH ]; @@ -1835,7 +1835,7 @@ PRIORITY should be one of the symbols high, normal, or low; any other symbol will be interpreted as normal. If successful, the return value is t, otherwise nil. */) - (process, priority) + (process, priority) Lisp_Object process, priority; { HANDLE proc_handle = GetCurrentProcess (); @@ -1881,7 +1881,8 @@ If successful, the return value is t, otherwise nil. */) #ifdef HAVE_LANGINFO_CODESET /* Emulation of nl_langinfo. Used in fns.c:Flocale_info. */ -char *nl_langinfo (nl_item item) +char * +nl_langinfo (nl_item item) { /* Conversion of Posix item numbers to their Windows equivalents. */ static const LCTYPE w32item[] = { @@ -2009,13 +2010,14 @@ human-readable form. */) return make_number (GetThreadLocale ()); } -DWORD int_from_hex (char * s) +DWORD +int_from_hex (char * s) { DWORD val = 0; static char hex[] = "0123456789abcdefABCDEF"; char * p; - while (*s && (p = strchr(hex, *s)) != NULL) + while (*s && (p = strchr (hex, *s)) != NULL) { unsigned digit = p - hex; if (digit > 15) @@ -2030,7 +2032,8 @@ DWORD int_from_hex (char * s) function isn't given a context pointer. */ Lisp_Object Vw32_valid_locale_ids; -BOOL CALLBACK enum_locale_fn (LPTSTR localeNum) +BOOL CALLBACK +enum_locale_fn (LPTSTR localeNum) { DWORD id = int_from_hex (localeNum); Vw32_valid_locale_ids = Fcons (make_number (id), Vw32_valid_locale_ids); @@ -2095,7 +2098,8 @@ If successful, the new locale id is returned, otherwise nil. */) function isn't given a context pointer. */ Lisp_Object Vw32_valid_codepages; -BOOL CALLBACK enum_codepage_fn (LPTSTR codepageNum) +BOOL CALLBACK +enum_codepage_fn (LPTSTR codepageNum) { DWORD id = atoi (codepageNum); Vw32_valid_codepages = Fcons (make_number (id), Vw32_valid_codepages); @@ -2271,6 +2275,7 @@ If successful, the new layout id is returned, otherwise nil. */) } +void syms_of_ntproc () { DEFSYM (Qhigh, "high"); diff --git a/src/w32select.c b/src/w32select.c index 2da4b333c2a..25abacbc75d 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -30,7 +30,7 @@ along with GNU Emacs. If not, see . */ * (CF_UNICODETEXT), when a well-known console codepage is given, they * apply to the console version of the clipboard data (CF_OEMTEXT), * else they apply to the normal 8-bit text clipboard (CF_TEXT). - * + * * When pasting (getting data from the OS), the clipboard format that * matches the {next-}selection-coding-system is retrieved. If * Unicode is requested, but not available, 8-bit text (CF_TEXT) is @@ -45,13 +45,13 @@ along with GNU Emacs. If not, see . */ * * Scenarios to use the facilities for customizing the selection * coding system are: - * + * * ;; Generally use KOI8-R instead of the russian MS codepage for * ;; the 8-bit clipboard. * (set-selection-coding-system 'koi8-r-dos) - * + * * Or - * + * * ;; Create a special clipboard copy function that uses codepage * ;; 1253 (Greek) to copy Greek text to a specific non-Unicode * ;; application. @@ -71,7 +71,7 @@ along with GNU Emacs. If not, see . */ * types should be supported is also moved to Lisp, functionality * could be expanded to CF_HTML, CF_RTF and maybe other types. */ - + #include #include #include "lisp.h" @@ -220,11 +220,11 @@ convert_to_handle_as_coded (Lisp_Object coding_system) unsigned char *dst = NULL; struct coding_system coding; - ONTRACE (fprintf (stderr, "convert_to_handle_as_coded: %s\n", + ONTRACE (fprintf (stderr, "convert_to_handle_as_coded: %s\n", SDATA (SYMBOL_NAME (coding_system)))); setup_windows_coding_system (coding_system, &coding); - coding.dst_bytes = SBYTES(current_text) * 2; + coding.dst_bytes = SBYTES (current_text) * 2; coding.destination = (unsigned char *) xmalloc (coding.dst_bytes); encode_coding_object (&coding, current_text, 0, 0, SCHARS (current_text), SBYTES (current_text), Qnil); @@ -290,7 +290,7 @@ render (Lisp_Object oformat) if (SetClipboardData (format, htext) == NULL) { - GlobalFree(htext); + GlobalFree (htext); return Qnil; } @@ -314,7 +314,7 @@ render_locale (void) if ((lcid_ptr = (LCID *) GlobalLock (hlocale)) == NULL) { - GlobalFree(hlocale); + GlobalFree (hlocale); return Qnil; } @@ -323,7 +323,7 @@ render_locale (void) if (SetClipboardData (CF_LOCALE, hlocale) == NULL) { - GlobalFree(hlocale); + GlobalFree (hlocale); return Qnil; } @@ -380,7 +380,7 @@ render_all (void) automatic conversions anywhere else, so to get consistent results, we probably don't want to rely on it here either. */ - render_locale(); + render_locale (); if (current_clipboard_type == CF_UNICODETEXT) render (make_number (CF_TEXT)); @@ -514,7 +514,7 @@ setup_config (void) && EQ (cfg_coding_system, dos_coding_system)) return; cfg_coding_system = dos_coding_system; - + /* Set some sensible fallbacks */ cfg_codepage = ANSICP; cfg_lcid = LOCALE_NEUTRAL; @@ -583,7 +583,7 @@ enum_locale_callback (/*const*/ char* loc_string) cfg_clipboard_type = CF_TEXT; return FALSE; /* Stop enumeration */ } - + /* Is the wanted codepage the OEM codepage for this locale? */ codepage = cp_from_locale (lcid, CF_OEMTEXT); if (codepage == cfg_codepage) @@ -704,7 +704,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, current_lcid = cfg_lcid; current_num_nls = 0; current_requires_encoding = 0; - + BLOCK_INPUT; /* Check for non-ASCII characters. While we are at it, count the @@ -744,7 +744,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, /* If we have something non-ASCII we may want to set a locale. We do that directly (non-delayed), as it's just a small bit. */ if (ok) - ok = !NILP(render_locale()); + ok = !NILP (render_locale ()); if (ok) { @@ -753,7 +753,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, /* If for some reason we don't have a clipboard_owner, we just set the text format as chosen by the configuration and than forget about the whole thing. */ - ok = !NILP(render (make_number (current_clipboard_type))); + ok = !NILP (render (make_number (current_clipboard_type))); current_text = Qnil; current_coding_system = Qnil; } @@ -884,7 +884,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, struct coding_system coding; Lisp_Object coding_system = Qnil; Lisp_Object dos_coding_system; - + /* `next-selection-coding-system' should override everything, even when the locale passed by the system disagrees. The only exception is when `next-selection-coding-system' @@ -1027,7 +1027,7 @@ the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. \(Those are literal upper-case symbol names, since that's what X expects.) For convenience, the symbol nil is the same as `PRIMARY', and t is the same as `SECONDARY'. */) - (selection) + (selection) Lisp_Object selection; { CHECK_SYMBOL (selection); @@ -1076,7 +1076,7 @@ syms_of_w32select () When sending or receiving text via cut_buffer, selection, and clipboard, the text is encoded or decoded by this coding system. The default value is the current system default encoding on 9x/Me and -`utf-16le-dos' (Unicode) on NT/W2K/XP. */); +`utf-16le-dos' (Unicode) on NT/W2K/XP. */); /* The actual value is set dynamically in the dumped Emacs, see below. */ Vselection_coding_system = Qnil; diff --git a/src/w32term.c b/src/w32term.c index 801c56bf994..bda7438f78a 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -325,8 +325,9 @@ XChangeGC (void * ignore, XGCValues* gc, unsigned long mask, gc->font = xgcv->font; } -XGCValues *XCreateGC (void * ignore, Window window, unsigned long mask, - XGCValues *xgcv) +XGCValues * +XCreateGC (void * ignore, Window window, unsigned long mask, + XGCValues *xgcv) { XGCValues *gc = (XGCValues *) xmalloc (sizeof (XGCValues)); bzero (gc, sizeof (XGCValues)); @@ -338,7 +339,7 @@ XGCValues *XCreateGC (void * ignore, Window window, unsigned long mask, void XGetGCValues (void* ignore, XGCValues *gc, - unsigned long mask, XGCValues *xgcv) + unsigned long mask, XGCValues *xgcv) { XChangeGC (ignore, xgcv, mask, gc); } @@ -920,7 +921,7 @@ w32_set_terminal_modes (struct terminal *term) { } -/* This is called when exiting or suspending Emacs. Exiting will make +/* This is called when exiting or suspending Emacs. Exiting will make the W32 windows go away, and suspending requires no action. */ static void @@ -2410,7 +2411,7 @@ x_draw_glyph_string (s) /* Draw strike-through. */ if (s->face->strike_through_p - && !FONT_TEXTMETRIC(s->font).tmStruckOut) + && !FONT_TEXTMETRIC (s->font).tmStruckOut) { unsigned long h = 1; unsigned long dy = (s->height - h) / 2; @@ -2889,7 +2890,8 @@ x_get_keysym_name (keysym) return value; } -static int codepage_for_locale(LCID locale) +static int +codepage_for_locale (LCID locale) { char cp[20]; @@ -3388,7 +3390,7 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole) BLOCK_INPUT; si.cbSize = sizeof (si); si.fMask = SIF_POS | SIF_PAGE; - GetScrollInfo(w, SB_CTL, &si); + GetScrollInfo (w, SB_CTL, &si); near_bottom_p = si.nPos + si.nPage >= range; UNBLOCK_INPUT; if (!near_bottom_p) @@ -4284,7 +4286,7 @@ w32_read_socket (sd, expected, hold_quit) temp_index = 0; temp_buffer[temp_index++] = msg.msg.wParam; inev.kind = MULTIMEDIA_KEY_EVENT; - inev.code = GET_APPCOMMAND_LPARAM(msg.msg.lParam); + inev.code = GET_APPCOMMAND_LPARAM (msg.msg.lParam); inev.modifiers = msg.dwModifiers; XSETFRAME (inev.frame_or_window, f); inev.timestamp = msg.msg.time; @@ -4332,7 +4334,7 @@ w32_read_socket (sd, expected, hold_quit) selected now and last mouse movement event was not in it. Minibuffer window will be selected only when it is active. */ - if (WINDOWP(window) + if (WINDOWP (window) && !EQ (window, last_window) && !EQ (window, selected_window) /* For click-to-focus window managers @@ -4346,7 +4348,7 @@ w32_read_socket (sd, expected, hold_quit) inev.frame_or_window = window; } - last_window=window; + last_window = window; } if (!note_mouse_movement (f, &msg.msg)) help_echo_string = previous_help_echo_string; @@ -5485,8 +5487,8 @@ x_set_window_size (f, change_gravity, cols, rows) rect.right = pixelwidth; rect.bottom = pixelheight; - AdjustWindowRect(&rect, f->output_data.w32->dwStyle, - FRAME_EXTERNAL_MENU_BAR (f)); + AdjustWindowRect (&rect, f->output_data.w32->dwStyle, + FRAME_EXTERNAL_MENU_BAR (f)); my_set_window_pos (FRAME_W32_WINDOW (f), NULL, @@ -5739,8 +5741,8 @@ x_make_frame_visible (f) /* Adjust vertical window position in order to avoid being covered by a task bar placed at the bottom of the desktop. */ - SystemParametersInfo(SPI_GETWORKAREA, 0, &workarea_rect, 0); - GetWindowRect(FRAME_W32_WINDOW(f), &window_rect); + SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0); + GetWindowRect (FRAME_W32_WINDOW (f), &window_rect); if (window_rect.bottom > workarea_rect.bottom && window_rect.top > workarea_rect.top) f->top_pos = max (window_rect.top @@ -6310,7 +6312,7 @@ x_delete_display (dpyinfo) } dpyinfo->color_list = NULL; if (dpyinfo->palette) - DeleteObject(dpyinfo->palette); + DeleteObject (dpyinfo->palette); } xfree (dpyinfo->w32_id_name); diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 9cd1ac6426c..6d75aa27f8a 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -175,7 +175,7 @@ uniscribe_otf_capability (font) f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); features = otf_features (context, "GSUB"); XSETCAR (capability, features); @@ -287,7 +287,7 @@ uniscribe_shape (lgstring) passed in. */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptShape (context, &(uniscribe_font->cache), chars + items[i].iCharPos, nchars_in_run, @@ -322,7 +322,7 @@ uniscribe_shape (lgstring) /* Cache not complete... */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptPlace (context, &(uniscribe_font->cache), glyphs, nglyphs, attributes, &(items[i].a), @@ -397,7 +397,7 @@ uniscribe_shape (lgstring) /* Cache incomplete... */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptGetGlyphABCWidth (context, &(uniscribe_font->cache), glyphs[j], &char_metric); @@ -509,7 +509,7 @@ uniscribe_encode_char (font, c) the frame. */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptShape (context, &(uniscribe_font->cache), ch, len, 2, &(items[0].a), glyphs, clusters, attrs, &nglyphs); @@ -650,7 +650,8 @@ static char* NOTHING = " "; /* Check if font supports the otf script/language/features specified. OTF_SPEC is in the format (script lang [(gsub_feature ...)|nil] [(gpos_feature ...)]?) */ -int uniscribe_check_otf (font, otf_spec) +int +uniscribe_check_otf (font, otf_spec) LOGFONT *font; Lisp_Object otf_spec; { @@ -947,7 +948,7 @@ struct font_driver uniscribe_font_driver = NULL, /* get_outline */ NULL, /* free_outline */ NULL, /* anchor_point */ - uniscribe_otf_capability, /* Defined so (font-get FONTOBJ :otf) works. */ + uniscribe_otf_capability, /* Defined so (font-get FONTOBJ :otf) works. */ NULL, /* otf_drive - use shape instead. */ NULL, /* start_for_frame */ NULL, /* end_for_frame */ diff --git a/src/w32xfns.c b/src/w32xfns.c index d77eb6b68ea..7e2a3704dff 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -216,7 +216,7 @@ get_next_msg (lpmsg, bWait) if (!UnionRect (&(lpmsg->rect), &(lpmsg->rect), &(lpCur->w32msg.rect))) { - SetRectEmpty(&(lpmsg->rect)); + SetRectEmpty (&(lpmsg->rect)); } myfree (lpCur); @@ -414,7 +414,6 @@ XParseGeometry (string, x, y, width, height) return (0); strind = nextCharacter; mask |= YNegative; - } else { @@ -428,7 +427,7 @@ XParseGeometry (string, x, y, width, height) } } - /* If strind isn't at the end of the string the it's an invalid + /* If strind isn't at the end of the string then it's an invalid geometry specification. */ if (*strind != '\0') return (0); -- cgit v1.2.1