------------------------------------------------------------ revno: 116163 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-01-25 19:39:34 -0800 message: Doc updates for opascal.el * lisp/progmodes/opascal.el (opascal-tab-always-indents, opascal-tab): Doc fix. Make obsolete. (opascal-mode): No longer mention opascal-tab-always-indents in doc. * doc/emacs/ack.texi (Acknowledgments): * doc/emacs/programs.texi (Program Modes): Update for delphi.el -> opascal.el renaming. * etc/NEWS: Edits. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-01-26 01:11:10 +0000 +++ doc/emacs/ChangeLog 2014-01-26 03:39:34 +0000 @@ -1,5 +1,9 @@ 2014-01-26 Glenn Morris + * ack.texi (Acknowledgments): + * programs.texi (Program Modes): + Update for delphi.el -> opascal.el renaming. + * misc.texi (Sorting): Add findex for reverse-region. * killing.texi (Deletion): Mention delete-duplicate-lines. === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2014-01-24 18:36:44 +0000 +++ doc/emacs/ack.texi 2014-01-26 03:39:34 +0000 @@ -126,8 +126,8 @@ Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars. @item -Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing -Delphi (Object Pascal) source code. +Ray Blaak and Simon South wrote @file{opascal.el}, a mode for editing +Object Pascal source code. @item Martin Blais, Stefan Merten, and David Goodger wrote @file{rst.el}, a === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-01-08 19:16:10 +0000 +++ doc/emacs/programs.texi 2014-01-26 03:39:34 +0000 @@ -75,17 +75,17 @@ @cindex VHDL mode @cindex M4 mode @cindex Shell-script mode -@cindex Delphi mode +@cindex OPascal mode @cindex PostScript mode @cindex Conf mode @cindex DNS mode @cindex Javascript mode Emacs has programming language modes for Lisp, Scheme, the -Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Delphi, +Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont -(@TeX{}'s companion for font creation), Modula2, Objective-C, Octave, -Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and -VHDL@. An alternative mode for Perl is called CPerl mode. Modes are +(@TeX{}'s companion for font creation), Modula2, Object Pascal, Objective-C, +Octave, Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, +and VHDL@. An alternative mode for Perl is called CPerl mode. Modes are also available for the scripting languages of the common GNU and Unix shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for makefiles, DNS master files, and various sorts of configuration files. === modified file 'etc/NEWS' --- etc/NEWS 2014-01-26 01:10:18 +0000 +++ etc/NEWS 2014-01-26 03:39:34 +0000 @@ -634,14 +634,19 @@ *** Documentation lookup/search. -** OPascal mode is the new name for Delphi mode. ++++ +** OPascal mode is the new name for Delphi mode +--- *** All delphi-* variables and functions have been renamed to opascal-*. +Obsolete aliases exist for those likely to have been used externally. -*** `delphi-newline-always-indents' is not supported any more. +--- +*** The option `delphi-newline-always-indents' has been removed. Use `electric-indent-mode' instead. -*** `delphi-tab' is gone, replaced by `indent-for-tab-command'. +--- +*** The TAB key runs the standard `indent-for-tab-command', not `delphi-tab'. ** Package @@ -690,18 +695,24 @@ ** Ruby mode +--- +*** Improved syntax highlighting and indentation. + +--- +*** New `electric-indent-mode' integration. + +--- *** New option `ruby-encoding-magic-comment-style'. +--- *** New option `ruby-custom-encoding-magic-comment-template'. -*** Improved syntax highlighting and indentation. +--- +*** New option `ruby-align-to-stmt-keywords'. +--- *** More Ruby file types have been added to `auto-mode-alist'. -*** New option `ruby-align-to-stmt-keywords'. - -*** New `electric-indent-mode' integration. - ** Search and Replace +++ @@ -760,6 +771,7 @@ Emacs can learn the appropriate indentation settings if you provide it with an indented sample file. +--- ** New Term mode option `term-suppress-hard-newline'. +++ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-26 01:10:18 +0000 +++ lisp/ChangeLog 2014-01-26 03:39:34 +0000 @@ -1,5 +1,9 @@ 2014-01-26 Glenn Morris + * progmodes/opascal.el (opascal-tab-always-indents, opascal-tab): + Doc fix. Make obsolete. + (opascal-mode): No longer mention opascal-tab-always-indents in doc. + * sort.el (delete-duplicate-lines): Doc fix. 2014-01-25 Rüdiger Sonderfeld === modified file 'lisp/progmodes/opascal.el' --- lisp/progmodes/opascal.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/opascal.el 2014-01-26 03:39:34 +0000 @@ -106,10 +106,14 @@ (define-obsolete-variable-alias 'delphi-tab-always-indents 'opascal-tab-always-indents "24.4") (defcustom opascal-tab-always-indents tab-always-indent - "Non-nil means TAB in OPascal mode should always reindent the current line, -regardless of where in the line point is when the TAB command is used." + "Non-nil means `opascal-tab' should always reindent the current line. +That is, regardless of where in the line point is at the time." :type 'boolean) +(make-obsolete-variable 'opascal-tab-always-indents + "use `indent-for-tab-command' and `tab-always-indent'." + "24.4") + (defconst opascal-directives '(absolute abstract assembler automated cdecl default dispid dynamic export external far forward index inline message name near nodefault @@ -1447,8 +1451,8 @@ (defun opascal-tab () - "Indent the region, when Transient Mark mode is enabled and the region is -active. Otherwise, indent the current line or insert a TAB, depending on the + "Indent the region, if Transient Mark mode is on and the region is active. +Otherwise, indent the current line or insert a TAB, depending on the value of `opascal-tab-always-indents' and the current line position." (interactive) (cond ((use-region-p) @@ -1465,6 +1469,7 @@ ;; Otherwise, insert a tab character. (insert "\t")))) +(make-obsolete 'opascal-tab 'indent-for-tab-command "24.4") (defun opascal-is-directory (path) ;; True if the specified path is an existing directory. @@ -1754,9 +1759,6 @@ Extra indentation for blocks in compound statements. `opascal-case-label-indent' (default 0) Extra indentation for case statement labels. - `opascal-tab-always-indents' (default `tab-always-indents') - Non-nil means TAB in OPascal mode should always reindent the current line, - regardless of where in the line point is when the TAB command is used. `opascal-search-path' (default .) Directories to search when finding external units. `opascal-verbose' (default nil) ------------------------------------------------------------ revno: 116162 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-01-25 17:20:24 -0800 message: When decoding, prefer ptrdiff_t to int for buffer positions etc. * coding.c (detect_coding_utf_8, emacs_mule_char) (detect_coding_iso_2022, encode_coding_iso_2022, check_ascii) (check_utf_8, decode_coding): * coding.h (struct coding_system.errors): Use ptrdiff_t, not int, for integer values derived from buffer and string positions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-26 00:32:30 +0000 +++ src/ChangeLog 2014-01-26 01:20:24 +0000 @@ -1,5 +1,13 @@ 2014-01-26 Paul Eggert + When decoding, prefer ptrdiff_t to int for buffer positions etc. + * coding.c (detect_coding_utf_8, emacs_mule_char) + (detect_coding_iso_2022, encode_coding_iso_2022, check_ascii) + (check_utf_8, decode_coding): + * coding.h (struct coding_system.errors): + Use ptrdiff_t, not int, for integer values derived from buffer and + string positions. + Fix crash with insert-file-contents and misdecoded text (Bug#16286). * fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK before invoking decode_coding_gap, since there's just one block. === modified file 'src/coding.c' --- src/coding.c 2014-01-01 07:43:34 +0000 +++ src/coding.c 2014-01-26 01:20:24 +0000 @@ -1202,7 +1202,7 @@ bool multibytep = coding->src_multibyte; ptrdiff_t consumed_chars = 0; bool bom_found = 0; - int nchars = coding->head_ascii; + ptrdiff_t nchars = coding->head_ascii; int eol_seen = coding->eol_seen; detect_info->checked |= CATEGORY_MASK_UTF_8; @@ -2013,7 +2013,7 @@ int charset_ID; unsigned code; int c; - int consumed_chars = 0; + ptrdiff_t consumed_chars = 0; bool mseq_found = 0; ONE_MORE_BYTE (c); @@ -3190,7 +3190,7 @@ if (! single_shifting && ! (rejected & CATEGORY_MASK_ISO_8_2)) { - int len = 1; + ptrdiff_t len = 1; while (src < src_end) { src_base = src; @@ -4456,7 +4456,7 @@ { /* We have to produce designation sequences if any now. */ unsigned char desig_buf[16]; - int nbytes; + ptrdiff_t nbytes; ptrdiff_t offset; charset_map_loaded = 0; @@ -6211,7 +6211,7 @@ EOL_SEEN_LF, EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when all the source bytes are ASCII. */ -static int +static ptrdiff_t check_ascii (struct coding_system *coding) { const unsigned char *src, *end; @@ -6283,12 +6283,12 @@ the value is reliable only when all the source bytes are valid UTF-8. */ -static int +static ptrdiff_t check_utf_8 (struct coding_system *coding) { const unsigned char *src, *end; int eol_seen; - int nchars = coding->head_ascii; + ptrdiff_t nchars = coding->head_ascii; if (coding->head_ascii < 0) check_ascii (coding); @@ -7414,7 +7414,7 @@ coding->carryover_bytes = 0; if (coding->consumed < coding->src_bytes) { - int nbytes = coding->src_bytes - coding->consumed; + ptrdiff_t nbytes = coding->src_bytes - coding->consumed; const unsigned char *src; coding_set_source (coding); === modified file 'src/coding.h' --- src/coding.h 2014-01-01 07:43:34 +0000 +++ src/coding.h 2014-01-26 01:20:24 +0000 @@ -477,7 +477,7 @@ ptrdiff_t produced, produced_char, consumed, consumed_char; /* Number of error source data found in a decoding routine. */ - int errors; + ptrdiff_t errors; /* Store the positions of error source data. */ ptrdiff_t *error_positions; ------------------------------------------------------------ revno: 116161 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-01-25 17:11:10 -0800 message: * doc/emacs/misc.texi (Sorting): Add findex for reverse-region. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-01-26 01:10:18 +0000 +++ doc/emacs/ChangeLog 2014-01-26 01:11:10 +0000 @@ -1,5 +1,7 @@ 2014-01-26 Glenn Morris + * misc.texi (Sorting): Add findex for reverse-region. + * killing.texi (Deletion): Mention delete-duplicate-lines. 2014-01-24 Glenn Morris === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2014-01-15 18:27:51 +0000 +++ doc/emacs/misc.texi 2014-01-26 01:11:10 +0000 @@ -1994,6 +1994,7 @@ used for comparison comes from a fixed range of columns. See below for an explanation. +@findex reverse-region @item M-x reverse-region Reverse the order of the lines in the region. This is useful for sorting into descending order by fields or columns, since those sort ------------------------------------------------------------ revno: 116160 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-01-25 17:10:18 -0800 message: Some doc for delete-duplicate-lines * doc/emacs/killing.texi (Deletion): Mention delete-duplicate-lines. * lisp/sort.el (delete-duplicate-lines): Doc fix. * etc/NEWS: Related edit. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-01-24 07:36:34 +0000 +++ doc/emacs/ChangeLog 2014-01-26 01:10:18 +0000 @@ -1,3 +1,7 @@ +2014-01-26 Glenn Morris + + * killing.texi (Deletion): Mention delete-duplicate-lines. + 2014-01-24 Glenn Morris * ack.texi (Acknowledgments): No longer mention obsolete xesam.el, === modified file 'doc/emacs/killing.texi' --- doc/emacs/killing.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/killing.texi 2014-01-26 01:10:18 +0000 @@ -136,6 +136,17 @@ previous line, by deleting a newline and all surrounding spaces, usually leaving a single space. @xref{Indentation,M-^}. +@c Not really sure where to put this... +@findex delete-duplicate-lines + The command @code{delete-duplicate-lines} searches the region for +identical lines, and removes all but one copy of each. Normally it +keeps the first instance of each repeated line, but with a @kbd{C-u} +prefix argument it keeps the last. With a @kbd{C-u C-u} prefix +argument, it only searches for adjacent identical lines. This is a +more efficient mode of operation, useful when the lines have already +been sorted. With a @kbd{C-u C-u C-u} prefix argument, it retains +repeated blank lines. + @node Killing by Lines @subsection Killing by Lines === modified file 'etc/NEWS' --- etc/NEWS 2014-01-25 03:00:52 +0000 +++ etc/NEWS 2014-01-26 01:10:18 +0000 @@ -312,12 +312,10 @@ *** New command `C-x r f' (`frameset-to-register'). See Changes in Emacs 24.4, above. ++++ ** New command `delete-duplicate-lines'. -When its arg ADJACENT is non-nil (when called interactively with C-u -C-u) it works like the utility `uniq'. Otherwise by default it -deletes duplicate lines everywhere in the region without regard to -adjacency. When its arg KEEP-BLANKS is non-nil (when called -interactively with C-u C-u C-u), duplicate blank lines are preserved. +This searches the region for identical lines, and removes all but one +copy of each repeated line. The lines need not be sorted. * Changes in Specialized Modes and Packages in Emacs 24.4 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-26 00:47:40 +0000 +++ lisp/ChangeLog 2014-01-26 01:10:18 +0000 @@ -1,3 +1,7 @@ +2014-01-26 Glenn Morris + + * sort.el (delete-duplicate-lines): Doc fix. + 2014-01-25 Rüdiger Sonderfeld * progmodes/ada-mode.el (ada): === modified file 'lisp/sort.el' --- lisp/sort.el 2014-01-01 07:43:34 +0000 +++ lisp/sort.el 2014-01-26 01:10:18 +0000 @@ -570,25 +570,23 @@ ;;;###autoload (defun delete-duplicate-lines (beg end &optional reverse adjacent keep-blanks interactive) - "Delete duplicate lines in the region between BEG and END. - -If REVERSE is nil, search and delete duplicates forward keeping the first -occurrence of duplicate lines. If REVERSE is non-nil (when called -interactively with C-u prefix), search and delete duplicates backward -keeping the last occurrence of duplicate lines. - -If ADJACENT is non-nil (when called interactively with two C-u prefixes), -delete repeated lines only if they are adjacent. It works like the utility -`uniq' and is useful when lines are already sorted in a large file since -this is more efficient in performance and memory usage than when ADJACENT -is nil that uses additional memory to remember previous lines. - -If KEEP-BLANKS is non-nil (when called interactively with three C-u prefixes), -duplicate blank lines are preserved. - -When called from Lisp and INTERACTIVE is omitted or nil, return the number -of deleted duplicate lines, do not print it; if INTERACTIVE is t, the -function behaves in all respects as if it had been called interactively." + "Delete all but one copy of any identical lines in the region. +Non-interactively, arguments BEG and END delimit the region. +Normally it searches forwards, keeping the first instance of +each identical line. If REVERSE is non-nil (interactively, with +a C-u prefix), it searches backwards and keeps the last instance of +each repeated line. + +Identical lines need not be adjacent, unless the argument +ADJACENT is non-nil (interactively, with a C-u C-u prefix). +This is a more efficient mode of operation, and may be useful +on large regions that have already been sorted. + +If the argument KEEP-BLANKS is non-nil (interactively, with a +C-u C-u C-u prefix), it retains repeated blank lines. + +Returns the number of deleted lines. Interactively, or if INTERACTIVE +is non-nil, it also prints a message describing the number of deletions." (interactive (progn (barf-if-buffer-read-only) ------------------------------------------------------------ revno: 116159 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2014-01-26 01:47:40 +0100 message: Fix ChangeLog typos. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2014-01-20 07:56:28 +0000 +++ leim/ChangeLog 2014-01-26 00:47:40 +0000 @@ -652,7 +652,7 @@ 2008-07-10 Teodor Zlatanov - * quail/cyrillic.el : Add more rules to cyrillic-translit, make + * quail/cyrillic.el: Add more rules to cyrillic-translit, make everything postfix. Adjust to eliminate conflicts. 2008-06-30 Juanma Barranquero === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-25 19:15:42 +0000 +++ lisp/ChangeLog 2014-01-26 00:47:40 +0000 @@ -168,7 +168,7 @@ Bind open-paren-in-column-0-is-defun-start to nil at some entry points. * progmodes/cc-engine.el (c-invalidate-state-cache-1) - (c-parse-state-1, c-guess-basic-syntax): Bind it here. + (c-parse-state-1, c-guess-basic-syntax): Bind it here. * progmodes/cc-mode.el (c-before-change, c-after-change) (c-font-lock-fontify-region): Bind it here. @@ -662,7 +662,7 @@ 2014-01-05 Kenjiro NAKAYAMA - * net/eww.el (eww): Support single/double quote for search. + * net/eww.el (eww): Support single/double quote for search. * net/eww.el (eww-list-histories,eww-history-browse): Fixup. (eww-history-quit): Delete and use quit-window. (eww-history-kill): Delete, because it doesn't work well and @@ -725,7 +725,7 @@ * mail/rmail.el (rmail-mime-message-p): Move from rmailmm.el. (rmail-epa-decrypt): Turn off mime processing. - * mail/rmail.el (rmail-make-in-reply-to-field): + * mail/rmail.el (rmail-make-in-reply-to-field): Add parens in message-id. * mail/rmail.el (rmail-get-coding-function): Variable. @@ -6532,7 +6532,7 @@ Silence byte-compiler warning. * frameset.el (frameset-p): Don't check non-nullness of the `properties' - slot , which can indeed be nil. + slot, which can indeed be nil. (frameset-live-filter-alist, frameset-persistent-filter-alist): Move entry for `left' from persistent to live filter alist. (frameset-filter-alist, frameset--minibufferless-last-p, frameset-save): @@ -7986,8 +7986,8 @@ Add `remember-notes' function to store random notes across Emacs restarts. - * textmodes/remember.el (remember-data-file): Add :set callback to affect - notes buffer (if any). + * textmodes/remember.el (remember-data-file): Add :set callback to + affect notes buffer (if any). (remember-notes): New command. (remember-notes-buffer-name, bury-remember-notes-on-kill): New defcustoms for the `remember-notes' function. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2014-01-16 08:34:43 +0000 +++ lisp/ChangeLog.10 2014-01-26 00:47:40 +0000 @@ -7680,7 +7680,7 @@ 2002-12-08 Nick Roberts - * gdb-ui.el : Remove inappropriate key-bindings. + * gdb-ui.el: Remove inappropriate key-bindings. (gdb-info-breakpoints-custom, gdb-goto-bp-this-line): Parse correctly when breakpoint has no line number. (def-gdb-auto-update-handler, gdb-info-locals-handler) @@ -8116,7 +8116,7 @@ 2002-11-21 Nick Roberts - * gdb-ui.el : General tidying. Patches from Stefan Monnier. + * gdb-ui.el: General tidying. Patches from Stefan Monnier. 2002-11-20 Simon Josefsson === modified file 'lisp/ChangeLog.11' --- lisp/ChangeLog.11 2014-01-16 08:34:43 +0000 +++ lisp/ChangeLog.11 2014-01-26 00:47:40 +0000 @@ -12520,7 +12520,7 @@ (gdb-update-flag): New variables. (gdb-var-update, gdb-var-update-handler,gdb-var-delete) (gdb-speedbar-expand-node, gdb-var-evaluate-expression-handler) - (gud-watch, gdb-var-create-handler) : New functions. + (gud-watch, gdb-var-create-handler): New functions. (gdb-var-list-children, gdb-var-list-children-handler) (gdb-var-create-regexp, gdb-var-update-regexp) (gdb-var-list-children-regexp): New constants. === modified file 'lisp/ChangeLog.13' --- lisp/ChangeLog.13 2014-01-11 03:55:50 +0000 +++ lisp/ChangeLog.13 2014-01-26 00:47:40 +0000 @@ -636,7 +636,7 @@ 2008-02-01 Vinicius Jose Latorre - * ps-print.el : Fix doc. + * ps-print.el: Fix doc. (ps-print-version): New version 7.0. 2008-02-01 Kenichi Handa === modified file 'lisp/ChangeLog.2' --- lisp/ChangeLog.2 2014-01-17 01:54:23 +0000 +++ lisp/ChangeLog.2 2014-01-26 00:47:40 +0000 @@ -3799,7 +3799,7 @@ 1986-06-14 Richard M. Stallman (rms@prep) - * mh-e.el : Install 3.3f from Larus. + * mh-e.el: Install 3.3f from Larus. 1986-06-12 Richard M. Stallman (rms@prep) === modified file 'lisp/ChangeLog.5' --- lisp/ChangeLog.5 2014-01-22 07:35:50 +0000 +++ lisp/ChangeLog.5 2014-01-26 00:47:40 +0000 @@ -3463,7 +3463,7 @@ 1995-02-04 G Dinesh Dutt (brat@htilbom.ernet.in) - * etags.el : Changes to support filenames as tags too and provided + * etags.el: Changes to support filenames as tags too and provided a drop-in replacement for list-tags. (find-tag-noselect): Recognize filenames as valid tags too. (find-tag-file-order): New variable holds function to check for match @@ -3671,7 +3671,7 @@ 1994-01-24 G Dinesh Dutt (brat@htilbom.ernet.in) - * etags.el : Changes to support filenames as tags too and provided + * etags.el: Changes to support filenames as tags too and provided a drop-in replacement for list-tags. (find-tag-noselect): Recognize filenames as valid tags too. (find-tag-file-order): New variable added. This contains the name of === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2014-01-18 01:27:51 +0000 +++ lisp/ChangeLog.9 2014-01-26 00:47:40 +0000 @@ -19790,7 +19790,7 @@ (bibtex-make-field, bibtex-end-of-entry, bibtex-sort-buffer) (bibtex-find-entry-location, bibtex-validate, bibtex-find-text) (bibtex-kill-entry, bibtex-clean-entry, bibtex-reformat) - (bibtex-complete-key, bibtex-String) : Use the new nomenclature. + (bibtex-complete-key, bibtex-String): Use the new nomenclature. 2000-02-15 Dirk Herrmann === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2014-01-15 03:06:07 +0000 +++ lisp/mh-e/ChangeLog 2014-01-26 00:47:40 +0000 @@ -1223,7 +1223,7 @@ (mh-show-subject, mh-show-to, mh-show-xface) (mh-speedbar-folder, mh-speedbar-folder-with-unseen-messages) (mh-speedbar-selected-folder) - (mh-speedbar-selected-folder-with-unseen-messages): : Add + (mh-speedbar-selected-folder-with-unseen-messages): Add :package-version keyword to these faces (closes SF #1452724). * mh-tool-bar.el (mh-tool-bar-define): Add commented-out === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2014-01-15 03:06:07 +0000 +++ lisp/mh-e/ChangeLog.1 2014-01-26 00:47:40 +0000 @@ -11261,7 +11261,7 @@ * mh-utils.el (mh-decode-quoted-printable): New customizable variable telling whether to run mimedecode on MIME message containing quoted-printable parts. mimedecode will - only alter quoted-printable parts , leaving others intact, and the + only alter quoted-printable parts, leaving others intact, and the resulting message is still fully MIME. * mh-utils.el (mh-decode-quoted-printable): New function to run mimedecode on the current buffer. === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2014-01-17 02:59:24 +0000 +++ lisp/org/ChangeLog 2014-01-26 00:47:40 +0000 @@ -6502,7 +6502,7 @@ "29.03 16:40". * org-element.el (org-element-center-block-parser) - (org-element-drawer-parser, , org-element-footnote-definition-parser) + (org-element-drawer-parser, org-element-footnote-definition-parser) (org-element-inlinetask-parser, org-element-plain-list-parser) (org-element-quote-block-parser, org-element-special-block-parser) (org-element-babel-call-parser, org-element-clock-parser) @@ -21490,7 +21490,7 @@ 2010-11-11 Nicolas Goaziou - * org-list.el : Removed unused variable + * org-list.el: Removed unused variable `org-suppress-item-indentation'. * org-list.el (org-renumber-ordered-list): Skip item if bullet === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2014-01-21 08:49:46 +0000 +++ src/ChangeLog.11 2014-01-26 00:47:40 +0000 @@ -5255,7 +5255,7 @@ (x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations before code. - * nsterm.h : Include sysselect.h. + * nsterm.h: Include sysselect.h. (x_sync, x_get_focus_frame, x_set_mouse_position) (x_set_mouse_pixel_position, x_make_frame_visible) (x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height) @@ -18934,7 +18934,7 @@ (ftfont_spec_pattern): Don't check QCfc_unknown_spec and QCname. (ftfont_list) [FC_FONTFORMAT]: Include FC_FONTFORMAT in objset. - * xftfont.c (QChinting , QCautohint, QChintstyle, QCrgba) + * xftfont.c (QChinting, QCautohint, QChintstyle, QCrgba) (QCembolden): New variables. (syms_of_xftfont): DEFSYM them. (xftfont_open): Call XftFontMatch. Don't trust the result of === modified file 'src/ChangeLog.3' --- src/ChangeLog.3 2014-01-15 03:06:07 +0000 +++ src/ChangeLog.3 2014-01-26 00:47:40 +0000 @@ -12551,7 +12551,7 @@ 1990-09-27 Richard Stallman (rms@mole.ai.mit.edu) - * emacs.c (main) : Set the DISPLAY environment value when both of + * emacs.c (main): Set the DISPLAY environment value when both of MAINTAIN_ENVIRONMENT and HAVE_X_WINDOW are defined. * m-convex.h (LIB_STANDARD, LIBS_MACHINE): Remove these, they === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2014-01-16 08:34:43 +0000 +++ src/ChangeLog.8 2014-01-26 00:47:40 +0000 @@ -2742,7 +2742,7 @@ (PARSE_MULTIBYTE_SEQ): Make it work also for ASCII string. (STRING_CHAR_AND_CHAR_LENGTH): This macro removed. - * charset.c : Lots of comments fixed. + * charset.c: Lots of comments fixed. (SPLIT_MULTIBYTE_SEQ): Make it work also for ASCII string. (CHAR_COMPONENTS_VALID_P): Name changed from CHAR_COMPONENT_VALID_P. Caller changed. ------------------------------------------------------------ revno: 116158 fixes bug: http://debbugs.gnu.org/16286 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-01-25 16:32:30 -0800 message: Fix crash with insert-file-contents and misdecoded text. * fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK before invoking decode_coding_gap, since there's just one block. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-25 14:39:49 +0000 +++ src/ChangeLog 2014-01-26 00:32:30 +0000 @@ -1,3 +1,9 @@ +2014-01-26 Paul Eggert + + Fix crash with insert-file-contents and misdecoded text (Bug#16286). + * fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK + before invoking decode_coding_gap, since there's just one block. + 2014-01-25 Martin Rudalics Fix handling of face attributes in Fx_create_frame (Bug#16529). === modified file 'src/fileio.c' --- src/fileio.c 2014-01-03 06:47:27 +0000 +++ src/fileio.c 2014-01-26 00:32:30 +0000 @@ -4298,6 +4298,7 @@ Z_BYTE -= inserted; ZV -= inserted; Z -= inserted; + coding.mode |= CODING_MODE_LAST_BLOCK; decode_coding_gap (&coding, inserted, inserted); inserted = coding.produced_char; coding_system = CODING_ID_NAME (coding.id); ------------------------------------------------------------ revno: 116157 committer: Rüdiger Sonderfeld branch nick: trunk timestamp: Sat 2014-01-25 20:15:42 +0100 message: Link to info manual in `defgroup'. * lisp/progmodes/ada-mode.el (ada): * lisp/woman.el (woman): Link to info manual and Commentary section. * lisp/url/url-vars.el (url): * lisp/erc/erc.el (erc): * lisp/progmodes/flymake.el (flymake): * lisp/nxml/nxml-mode.el (nxml): * lisp/net/eww.el (eww): * lisp/speedbar.el (speedbar, speedbar-faces, speedbar-vc): * lisp/htmlfontify.el (htmlfontify): * lisp/ses.el (ses): * lisp/epa.el (epa): * lisp/ido.el (ido): Link to info manual. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-25 18:32:34 +0000 +++ lisp/ChangeLog 2014-01-25 19:15:42 +0000 @@ -1,3 +1,17 @@ +2014-01-25 Rüdiger Sonderfeld + + * progmodes/ada-mode.el (ada): + * woman.el (woman): Link to info manual and Commentary section. + + * progmodes/flymake.el (flymake): + * nxml/nxml-mode.el (nxml): + * net/eww.el (eww): + * speedbar.el (speedbar, speedbar-faces, speedbar-vc): + * htmlfontify.el (htmlfontify): + * ses.el (ses): + * epa.el (epa): + * ido.el (ido): Link to info manual. + 2014-01-25 Leo Liu * progmodes/flymake.el (flymake-make-overlay): No rear advance. === modified file 'lisp/epa.el' --- lisp/epa.el 2014-01-01 07:43:34 +0000 +++ lisp/epa.el 2014-01-25 19:15:42 +0000 @@ -31,6 +31,7 @@ (defgroup epa nil "The EasyPG Assistant" :version "23.1" + :link '(custom-manual "(epa) Top") :group 'epg) (defcustom epa-popup-info-window t === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2014-01-22 01:43:37 +0000 +++ lisp/erc/ChangeLog 2014-01-25 19:15:42 +0000 @@ -1,3 +1,7 @@ +2014-01-25 Rüdiger Sonderfeld + + * erc.el (erc): Link to info manual. + 2013-12-28 Glenn Morris * erc-log.el (erc-log-file-coding-system): Specify custom type. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2014-01-01 07:43:34 +0000 +++ lisp/erc/erc.el 2014-01-25 19:15:42 +0000 @@ -81,6 +81,7 @@ (defgroup erc nil "Emacs Internet Relay Chat client." :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/ERC") + :link '(custom-manual "(erc) Top") :prefix "erc-" :group 'applications) === modified file 'lisp/htmlfontify.el' --- lisp/htmlfontify.el 2014-01-16 06:24:06 +0000 +++ lisp/htmlfontify.el 2014-01-25 19:15:42 +0000 @@ -146,6 +146,8 @@ "Convert buffers and files to HTML." :group 'applications :link '(variable-link htmlfontify-manual) + :link '(custom-manual "(htmlfontify) Top") + :link '(info-link "(htmlfontify) Customization") :prefix "hfy-") (defcustom hfy-page-header 'hfy-default-header === modified file 'lisp/ido.el' --- lisp/ido.el 2014-01-01 07:43:34 +0000 +++ lisp/ido.el 2014-01-25 19:15:42 +0000 @@ -337,7 +337,9 @@ :group 'convenience :version "22.1" :link '(emacs-commentary-link :tag "Commentary" "ido.el") - :link '(emacs-library-link :tag "Lisp File" "ido.el")) + :link '(emacs-library-link :tag "Lisp File" "ido.el") + :link '(custom-manual "(ido) Top") + :link '(info-link "(ido) Customization")) ;;;###autoload (defcustom ido-mode nil === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2014-01-24 04:15:13 +0000 +++ lisp/net/eww.el 2014-01-25 19:15:42 +0000 @@ -33,6 +33,7 @@ (defgroup eww nil "Emacs Web Wowser" :version "24.4" + :link '(custom-manual "(eww) Top") :group 'hypermedia :prefix "eww-") === modified file 'lisp/nxml/nxml-mode.el' --- lisp/nxml/nxml-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/nxml/nxml-mode.el 2014-01-25 19:15:42 +0000 @@ -46,6 +46,7 @@ (defgroup nxml nil "New XML editing mode." + :link '(custom-manual "(nxml-mode) Top") :group 'languages) (defgroup nxml-faces nil === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/ada-mode.el 2014-01-25 19:15:42 +0000 @@ -149,6 +149,8 @@ (defgroup ada nil "Major mode for editing and compiling Ada source in Emacs." :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) + :link '(custom-manual "(ada-mode) Top") + :link '(emacs-commentary-link :tag "Commentary" "ada-mode.el") :group 'languages) (defcustom ada-auto-case t === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2014-01-25 18:32:34 +0000 +++ lisp/progmodes/flymake.el 2014-01-25 19:15:42 +0000 @@ -40,6 +40,7 @@ (defgroup flymake nil "Universal on-the-fly syntax checker." :version "23.1" + :link '(custom-manual "(flymake) Top") :group 'tools) (defcustom flymake-error-bitmap '(exclamation-mark error) === modified file 'lisp/ses.el' --- lisp/ses.el 2014-01-06 06:25:30 +0000 +++ lisp/ses.el 2014-01-25 19:15:42 +0000 @@ -67,6 +67,7 @@ "Simple Emacs Spreadsheet." :tag "SES" :group 'applications + :link '(custom-manual "(ses) Top") :prefix "ses-" :version "21.1") === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2014-01-13 22:21:32 +0000 +++ lisp/speedbar.el 2014-01-25 19:15:42 +0000 @@ -135,17 +135,21 @@ :group 'etags :group 'tools :group 'convenience + :link '(custom-manual "(speedbar) Top") + :link '(info-link "(speedbar) Customizing") ; :version "20.3" ) (defgroup speedbar-faces nil "Faces used in speedbar." :prefix "speedbar-" + :link '(info-link "(speedbar) Frames and Faces") :group 'speedbar :group 'faces) (defgroup speedbar-vc nil "Version control display in speedbar." + :link '(info-link "(speedbar) Version Control") :prefix "speedbar-" :group 'speedbar) === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2014-01-22 01:43:37 +0000 +++ lisp/url/ChangeLog 2014-01-25 19:15:42 +0000 @@ -1,3 +1,7 @@ +2014-01-25 Rüdiger Sonderfeld + + * url-vars.el (url): Link to info manual. + 2014-01-08 Jarosław Rzeszótko (tiny change) * url-http.el (url-http-create-request): Don't add extra \r\n after === modified file 'lisp/url/url-vars.el' --- lisp/url/url-vars.el 2014-01-01 07:43:34 +0000 +++ lisp/url/url-vars.el 2014-01-25 19:15:42 +0000 @@ -28,6 +28,8 @@ (defgroup url nil "Uniform Resource Locator tool." :version "22.1" + :link '(custom-manual "(url) Top") + :link '(info-link "(url) Customization") :group 'comm) (defgroup url-file nil === modified file 'lisp/woman.el' --- lisp/woman.el 2014-01-24 07:29:39 +0000 +++ lisp/woman.el 2014-01-25 19:15:42 +0000 @@ -495,6 +495,8 @@ (defgroup woman nil "Browse UNIX manual pages `wo (without) man'." :tag "WoMan" + :link '(custom-manual "(woman) Top") + :link '(emacs-commentary-link :tag "Commentary" "woman.el") :group 'help) (defcustom woman-show-log nil ------------------------------------------------------------ revno: 116156 committer: Leo Liu branch nick: trunk timestamp: Sun 2014-01-26 02:32:34 +0800 message: * progmodes/flymake.el (flymake-make-overlay): No rear advance. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-25 00:52:16 +0000 +++ lisp/ChangeLog 2014-01-25 18:32:34 +0000 @@ -1,3 +1,7 @@ +2014-01-25 Leo Liu + + * progmodes/flymake.el (flymake-make-overlay): No rear advance. + 2014-01-25 Adam Sjøgren * net/shr.el (shr-tag-img): Prefer the title over the alt text === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/flymake.el 2014-01-25 18:32:34 +0000 @@ -690,7 +690,7 @@ (defun flymake-make-overlay (beg end tooltip-text face bitmap) "Allocate a flymake overlay in range BEG and END." (when (not (flymake-region-has-flymake-overlays beg end)) - (let ((ov (make-overlay beg end nil t t)) + (let ((ov (make-overlay beg end nil t)) (fringe (and flymake-fringe-indicator-position (propertize "!" 'display (cons flymake-fringe-indicator-position ------------------------------------------------------------ revno: 116155 committer: martin rudalics branch nick: trunk timestamp: Sat 2014-01-25 15:39:49 +0100 message: Fix handling of face attributes in Fx_create_frame (Bug#16529). * w32fns.c (Fx_create_frame): Don't inhibit running Lisp code too early. Again run change_frame_size before assigning menu- and tool-bar-lines. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-25 13:04:48 +0000 +++ src/ChangeLog 2014-01-25 14:39:49 +0000 @@ -1,3 +1,10 @@ +2014-01-25 Martin Rudalics + + Fix handling of face attributes in Fx_create_frame (Bug#16529). + * w32fns.c (Fx_create_frame): Don't inhibit running Lisp code + too early. Again run change_frame_size before assigning menu- + and tool-bar-lines. + 2014-01-25 Fabrice Popineau * w32term.c (w32_read_socket): When the WM_DISPLAYCHANGE message === modified file 'src/w32fns.c' --- src/w32fns.c 2014-01-21 16:08:31 +0000 +++ src/w32fns.c 2014-01-25 14:39:49 +0000 @@ -4418,12 +4418,6 @@ /* With FRAME_DISPLAY_INFO set up, this unwind-protect is safe. */ record_unwind_protect (do_unwind_create_frame, frame); - /* Avoid calling window-configuration-change-hook; otherwise we could - get into all kinds of nasty things like an infloop in next_frame or - violating a (height >= 0) assertion in window_box_height. */ - record_unwind_protect (unwind_create_frame_1, inhibit_lisp_code); - inhibit_lisp_code = Qt; - #ifdef GLYPH_DEBUG image_cache_refcount = FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; @@ -4518,17 +4512,40 @@ happen. */ init_frame_faces (f); - /* The X resources controlling the menu-bar and tool-bar are - processed specially at startup, and reflected in the mode - variables; ignore them here. */ - x_default_parameter (f, parameters, Qmenu_bar_lines, - NILP (Vmenu_bar_mode) - ? make_number (0) : make_number (1), - NULL, NULL, RES_TYPE_NUMBER); - x_default_parameter (f, parameters, Qtool_bar_lines, - NILP (Vtool_bar_mode) - ? make_number (0) : make_number (1), - NULL, NULL, RES_TYPE_NUMBER); + /* Avoid calling window-configuration-change-hook; otherwise we + could get an infloop in next_frame since the frame is not yet in + Vframe_list. */ + { + ptrdiff_t count2 = SPECPDL_INDEX (); + + record_unwind_protect (unwind_create_frame_1, inhibit_lisp_code); + inhibit_lisp_code = Qt; + + /* PXW: This is a duplicate from below. We have to do it here since + otherwise x_set_tool_bar_lines will work with the character sizes + installed by init_frame_faces while the frame's pixel size is still + calculated from a character size of 1 and we subsequently hit the + eassert (height >= 0) assertion in window_box_height. The + non-pixelwise code apparently worked around this because it had one + frame line vs one toolbar line which left us with a zero root + window height which was obviously wrong as well ... */ + change_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), + FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1, 0, 0, 1); + + /* The X resources controlling the menu-bar and tool-bar are + processed specially at startup, and reflected in the mode + variables; ignore them here. */ + x_default_parameter (f, parameters, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parameters, Qtool_bar_lines, + NILP (Vtool_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + + unbind_to (count2, Qnil); + } x_default_parameter (f, parameters, Qbuffer_predicate, Qnil, "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); ------------------------------------------------------------ revno: 116154 fixes bug: http://debbugs.gnu.org/16517 author: Fabrice Popineau committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-01-25 15:04:48 +0200 message: Fix bug #16517 with display change on MS-Windows while in full-screen mode. src/w32term.c (w32_read_socket): When the WM_DISPLAYCHANGE message arrives, call x_check_fullscreen, in case the new display has a different resolution. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-25 08:25:51 +0000 +++ src/ChangeLog 2014-01-25 13:04:48 +0000 @@ -1,3 +1,9 @@ +2014-01-25 Fabrice Popineau + + * w32term.c (w32_read_socket): When the WM_DISPLAYCHANGE message + arrives, call x_check_fullscreen, in case the new display has a + different resolution. (Bug#16517) + 2014-01-25 Eli Zaretskii * term.c (read_menu_input): If the selected frame changes, exit === modified file 'src/w32term.c' --- src/w32term.c 2014-01-04 09:31:30 +0000 +++ src/w32term.c 2014-01-25 13:04:48 +0000 @@ -4841,6 +4841,10 @@ if (f) { dpyinfo->n_cbits = msg.msg.wParam; + /* The new display could have a different resolution, in + which case we must reconsider what fullscreen + means. */ + x_check_fullscreen (f); DebPrint (("display change: %d %d\n", (short) LOWORD (msg.msg.lParam), (short) HIWORD (msg.msg.lParam))); ------------------------------------------------------------ revno: 116153 fixes bug: http://debbugs.gnu.org/16479 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-01-25 10:25:51 +0200 message: Fix bug #16479 with client connections while TTY menu is open. src/term.c (read_menu_input): If the selected frame changes, exit the menu. (tty_menu_show): If the selected frame changes while we displayed a menu, throw to top level. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-25 03:48:29 +0000 +++ src/ChangeLog 2014-01-25 08:25:51 +0000 @@ -1,3 +1,10 @@ +2014-01-25 Eli Zaretskii + + * term.c (read_menu_input): If the selected frame changes, exit + the menu. + (tty_menu_show): If the selected frame changes while we displayed + a menu, throw to top level. (Bug#16479) + 2014-01-25 Stefan Monnier * eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change. === modified file 'src/term.c' --- src/term.c 2014-01-01 07:43:34 +0000 +++ src/term.c 2014-01-25 08:25:51 +0000 @@ -3124,7 +3124,11 @@ tty->showing_menu = 0; do_mouse_tracking = saved_mouse_tracking; - if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit)) + if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit) + /* If some input switched frames under our feet, exit the + menu, since the menu faces are no longer valid, and the + menu is no longer relevant anyway. */ + || sf != SELECTED_FRAME ()) return MI_QUIT_MENU; if (EQ (cmd, Qtty_menu_mouse_movement)) mouse_get_xy (x, y); @@ -3791,6 +3795,11 @@ case TTYM_IA_SELECT: break; case TTYM_NO_SELECT: + /* If the selected frame was changed while we displayed a menu, + throw to top level in order to undo any temporary settings + made by TTY menu code. */ + if (f != SELECTED_FRAME ()) + Ftop_level (); /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means the menu was invoked with a mouse event as POSITION). */ if (! for_click)