------------------------------------------------------------ revno: 116206 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 23:54:28 -0800 message: * etc/NEWS: ElDoc related edit. * lisp/emacs-lisp/eldoc.el: Related commentary. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-30 07:48:06 +0000 +++ etc/NEWS 2014-01-30 07:54:28 +0000 @@ -462,7 +462,10 @@ ** New Dired minor mode `dired-hide-details-mode' toggles whether details, such as file ownership or permissions, are visible. -** Eldoc Mode works properly in the minibuffer. +--- +** You can enable ElDoc inside the `eval-expression' minibuffer with: + (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode) +The results display in the mode line. ** Electric Pair mode @@ -623,7 +626,7 @@ *** Completion in Octave file buffers. -*** Eldoc support. +*** ElDoc support. *** Jump to definition. === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-01-30 07:42:57 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-01-30 07:54:28 +0000 @@ -39,6 +39,7 @@ ;; (add-hook 'emacs-lisp-mode-hook 'eldoc-mode) ;; (add-hook 'lisp-interaction-mode-hook 'eldoc-mode) ;; (add-hook 'ielm-mode-hook 'eldoc-mode) +;; (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode) ;; Major modes for other languages may use ElDoc by defining an ;; appropriate function as the buffer-local value of ------------------------------------------------------------ revno: 116205 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 23:48:06 -0800 message: * lisp/simple.el (eval-expression): Doc fix. * etc/NEWS: Add missing entry. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-29 08:36:32 +0000 +++ etc/NEWS 2014-01-30 07:48:06 +0000 @@ -221,6 +221,9 @@ `(eval-expression-)print-level' to nil. Additionally, it causes integers to be printed in other formats (octal, hexadecimal, and character). +*** New hook `eval-expression-minibuffer-setup-hook' run by +`eval-expression' on entering the minibuffer. + --- ** `write-region-inhibit-fsync' now defaults to t in batch mode. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 07:42:57 +0000 +++ lisp/ChangeLog 2014-01-30 07:48:06 +0000 @@ -1,5 +1,7 @@ 2014-01-30 Glenn Morris + * simple.el (eval-expression): Doc fix. + * hexl.el (hexl-mode-hook): * ielm.el (ielm-mode-hook): * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook) === modified file 'lisp/simple.el' --- lisp/simple.el 2014-01-29 08:27:55 +0000 +++ lisp/simple.el 2014-01-30 07:48:06 +0000 @@ -1401,6 +1401,9 @@ also causes integers to be printed in several additional formats \(octal, hexadecimal, and character). +Runs the hook `eval-expression-minibuffer-setup-hook' on entering the +minibuffer. + If `eval-expression-debug-on-error' is non-nil, which is the default, this command arranges for all errors to enter the debugger." (interactive ------------------------------------------------------------ revno: 116204 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 23:42:57 -0800 message: Replace refs to obsolete alias `turn-on-eldoc-mode' with `eldoc-mode' * lisp/hexl.el (hexl-mode-hook): * lisp/ielm.el (ielm-mode-hook): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook) (lisp-interaction-mode-hook): * lisp/progmodes/cfengine.e (cfengine3-documentation-function): Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'. * lisp/emacs-lisp/eldoc.el: Same in commentary. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 04:02:28 +0000 +++ lisp/ChangeLog 2014-01-30 07:42:57 +0000 @@ -1,3 +1,12 @@ +2014-01-30 Glenn Morris + + * hexl.el (hexl-mode-hook): + * ielm.el (ielm-mode-hook): + * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook) + (lisp-interaction-mode-hook): + * progmodes/cfengine.e (cfengine3-documentation-function): + Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'. + 2014-01-30 Stefan Monnier * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic' === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-01-21 13:09:55 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-01-30 07:42:57 +0000 @@ -36,9 +36,9 @@ ;; One useful way to enable this minor mode is to put the following in your ;; .emacs: ;; -;; (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode) -;; (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode) -;; (add-hook 'ielm-mode-hook 'turn-on-eldoc-mode) +;; (add-hook 'emacs-lisp-mode-hook 'eldoc-mode) +;; (add-hook 'lisp-interaction-mode-hook 'eldoc-mode) +;; (add-hook 'ielm-mode-hook 'eldoc-mode) ;; Major modes for other languages may use ElDoc by defining an ;; appropriate function as the buffer-local value of === modified file 'lisp/emacs-lisp/lisp-mode.el' --- lisp/emacs-lisp/lisp-mode.el 2014-01-23 07:53:56 +0000 +++ lisp/emacs-lisp/lisp-mode.el 2014-01-30 07:42:57 +0000 @@ -681,7 +681,7 @@ (defcustom emacs-lisp-mode-hook nil "Hook run when entering Emacs Lisp mode." - :options '(turn-on-eldoc-mode imenu-add-menubar-index checkdoc-minor-mode) + :options '(eldoc-mode imenu-add-menubar-index checkdoc-minor-mode) :type 'hook :group 'lisp) @@ -693,7 +693,7 @@ (defcustom lisp-interaction-mode-hook nil "Hook run when entering Lisp Interaction mode." - :options '(turn-on-eldoc-mode) + :options '(eldoc-mode) :type 'hook :group 'lisp) === modified file 'lisp/hexl.el' --- lisp/hexl.el 2014-01-01 07:43:34 +0000 +++ lisp/hexl.el 2014-01-30 07:42:57 +0000 @@ -1,7 +1,6 @@ ;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation, Inc. ;; Author: Keith Gabryelski ;; Maintainer: FSF @@ -91,7 +90,7 @@ (defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler) "Normal hook run when entering Hexl mode." :type 'hook - :options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode) + :options '(hexl-follow-line hexl-activate-ruler eldoc-mode) :group 'hexl) (defface hexl-address-region === modified file 'lisp/ielm.el' --- lisp/ielm.el 2014-01-03 05:10:52 +0000 +++ lisp/ielm.el 2014-01-30 07:42:57 +0000 @@ -118,7 +118,7 @@ (defcustom ielm-mode-hook nil "Hooks to be run when IELM (`inferior-emacs-lisp-mode') is started." - :options '(turn-on-eldoc-mode) + :options '(eldoc-mode) :type 'hook :group 'ielm) (defvaralias 'inferior-emacs-lisp-mode-hook 'ielm-mode-hook) === modified file 'lisp/progmodes/cfengine.el' --- lisp/progmodes/cfengine.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/cfengine.el 2014-01-30 07:42:57 +0000 @@ -47,7 +47,7 @@ ;; It's *highly* recommended that you enable the eldoc minor mode: -;; (add-hook 'cfengine3-mode-hook 'turn-on-eldoc-mode) +;; (add-hook 'cfengine3-mode-hook 'eldoc-mode) ;; This is not the same as the mode written by Rolf Ebert ;; , distributed with cfengine-2.0.5. It does @@ -1257,8 +1257,8 @@ (defun cfengine3-documentation-function () "Document CFengine 3 functions around point. -Intended as the value of `eldoc-documentation-function', which -see. Use it by executing `turn-on-eldoc-mode'." +Intended as the value of `eldoc-documentation-function', which see. +Use it by enabling `eldoc-mode'." (let ((fdef (cfengine3--current-function))) (when fdef (cfengine3-format-function-docstring fdef)))) ------------------------------------------------------------ revno: 116203 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16584 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2014-01-29 23:13:00 -0500 message: * eieio-opt.el (eieio-help-generic): Fix last change. diff: === modified file 'lisp/emacs-lisp/eieio-opt.el' --- lisp/emacs-lisp/eieio-opt.el 2014-01-30 04:02:28 +0000 +++ lisp/emacs-lisp/eieio-opt.el 2014-01-30 04:13:00 +0000 @@ -315,7 +315,7 @@ ;;;###autoload (defun eieio-help-generic (generic) "Describe GENERIC if it is a generic function." - (when (and symbolp generic) (generic-p generic)) + (when (and (symbolp generic) (generic-p generic)) (save-excursion (goto-char (point-min)) (when (re-search-forward " in `.+'.$" nil t) ------------------------------------------------------------ revno: 116202 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16584 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2014-01-29 23:02:28 -0500 message: * lisp/emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic' is a symbol. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 02:40:19 +0000 +++ lisp/ChangeLog 2014-01-30 04:02:28 +0000 @@ -1,3 +1,8 @@ +2014-01-30 Stefan Monnier + + * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic' + is a symbol (bug#16584). + 2014-01-30 Glenn Morris * help.el (help-for-help-internal): Add "P" to text. === modified file 'lisp/emacs-lisp/eieio-opt.el' --- lisp/emacs-lisp/eieio-opt.el 2014-01-10 07:10:37 +0000 +++ lisp/emacs-lisp/eieio-opt.el 2014-01-30 04:02:28 +0000 @@ -315,7 +315,7 @@ ;;;###autoload (defun eieio-help-generic (generic) "Describe GENERIC if it is a generic function." - (when (generic-p generic) + (when (and symbolp generic) (generic-p generic)) (save-excursion (goto-char (point-min)) (when (re-search-forward " in `.+'.$" nil t) ------------------------------------------------------------ revno: 116201 committer: Xue Fuqiao branch nick: trunk timestamp: Thu 2014-01-30 11:41:34 +0800 message: * doc/misc/sem-user.texi (Include paths): Fix a Texinfo command. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-27 02:02:28 +0000 +++ doc/misc/ChangeLog 2014-01-30 03:41:34 +0000 @@ -1,3 +1,7 @@ +2014-01-30 Xue Fuqiao + + * sem-user.texi (Include paths): Fix a Texinfo command. + 2014-01-27 Glenn Morris * idlwave.texi (Lesson III---User Catalog, Online Help) === modified file 'doc/misc/sem-user.texi' --- doc/misc/sem-user.texi 2014-01-05 02:56:08 +0000 +++ doc/misc/sem-user.texi 2014-01-30 03:41:34 +0000 @@ -416,11 +416,11 @@ @var{mode}). @end deffn -@defun semanticdb-implied-include-tags +@defvar semanticdb-implied-include-tags Include tags implied for all files of a given mode. You can set this variable with @code{defvar-mode-local} for a particular mode so that any symbols that exist for all files for that mode are included. -@end defun +@end defvar @c @xref{Search Optimization}, for more information on include paths. ------------------------------------------------------------ revno: 116200 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 21:40:19 -0500 message: * lisp/help.el (help-for-help-internal): Add "P" to text. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-29 08:27:55 +0000 +++ lisp/ChangeLog 2014-01-30 02:40:19 +0000 @@ -1,3 +1,7 @@ +2014-01-30 Glenn Morris + + * help.el (help-for-help-internal): Add "P" to text. + 2014-01-29 Glenn Morris * simple.el (just-one-space, cycle-spacing): Doc fixes. === modified file 'lisp/help.el' --- lisp/help.el 2014-01-10 02:44:51 +0000 +++ lisp/help.el 2014-01-30 02:40:19 +0000 @@ -214,6 +214,7 @@ including their special commands. n Display news of recent Emacs changes. p TOPIC Find packages matching a given topic keyword. +P PACKAGE Describe the given Emacs Lisp package. r Display the Emacs manual in Info mode. s Display contents of current syntax table, plus explanations. S SYMBOL Show the section for the given symbol in the on-line manual ------------------------------------------------------------ revno: 116199 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-01-29 10:39:11 -0800 message: * xmenu.c (create_and_show_popup_menu): Port comment to C89. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 18:17:20 +0000 +++ src/ChangeLog 2014-01-29 18:39:11 +0000 @@ -1,3 +1,7 @@ +2014-01-29 Paul Eggert + + * xmenu.c (create_and_show_popup_menu): Port comment to C89. + 2014-01-29 Eli Zaretskii * .gdbinit (xprintstr, xprintbytestr): Don't use repetition count === modified file 'src/xmenu.c' --- src/xmenu.c 2014-01-29 08:23:59 +0000 +++ src/xmenu.c 2014-01-29 18:39:11 +0000 @@ -1306,7 +1306,7 @@ for (i = 0; i < 5; i++) if (FRAME_DISPLAY_INFO (f)->grabbed & (1 << i)) break; - // If keys aren't grabbed (i.e. a mouse up event), use 0. + /* If keys aren't grabbed (i.e., a mouse up event), use 0. */ if (i == 5) i = 0; } ------------------------------------------------------------ revno: 116198 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2014-01-29 20:17:20 +0200 message: Fix printing empty Lisp strings. src/.gdbinit (xprintstr, xprintbytestr): Don't use repetition count of zero to print strings, GDB doesn't like it. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2014-01-01 07:43:34 +0000 +++ src/.gdbinit 2014-01-29 18:17:20 +0000 @@ -1072,7 +1072,13 @@ define xprintstr set $data = (char *) $arg0->data - output ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~ARRAY_MARK_FLAG : $arg0->size_byte) + set $strsize = ($arg0->size_byte < 0) ? ($arg0->size & ~ARRAY_MARK_FLAG) : $arg0->size_byte + # GDB doesn't like zero repetition counts + if $strsize == 0 + output "" + else + output ($arg0->size > 1000) ? 0 : ($data[0])@($strsize) + end end define xprintsym @@ -1184,8 +1190,13 @@ define xprintbytestr set $data = (char *) $arg0->data + set $bstrsize = ($arg0->size_byte < 0) ? ($arg0->size & ~ARRAY_MARK_FLAG) : $arg0->size_byte printf "Bytecode: " - output/u ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~ARRAY_MARK_FLAG : $arg0->size_byte) + if $bstrsize > 0 + output/u ($arg0->size > 1000) ? 0 : ($data[0])@($bvsize) + else + printf "" + end end document xprintbytestr Print a string of byte code. === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 17:52:16 +0000 +++ src/ChangeLog 2014-01-29 18:17:20 +0000 @@ -1,5 +1,8 @@ 2014-01-29 Eli Zaretskii + * .gdbinit (xprintstr, xprintbytestr): Don't use repetition count + of zero to print strings, GDB doesn't like it. + * print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE, not STRING_CHAR_AND_LENGTH, so that if the string is relocated by GC, we still use correct addresses. (Bug#16576) ------------------------------------------------------------ revno: 116197 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2014-01-29 20:04:11 +0200 message: src/indent.c (current_column_1): Correct commentary. diff: === modified file 'src/indent.c' --- src/indent.c 2014-01-01 17:44:48 +0000 +++ src/indent.c 2014-01-29 18:04:11 +0000 @@ -700,7 +700,7 @@ *prevcol = prev_col; } -/* Return the column number of position POS +/* Return the column number of point by scanning forward from the beginning of the line. This function handles characters that are invisible due to text properties or overlays. */ ------------------------------------------------------------ revno: 116196 fixes bug: http://debbugs.gnu.org/16576 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2014-01-29 19:52:16 +0200 message: Fix bug #16576 with PRINTCHARFUN that conses output a lot. src/print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE, not STRING_CHAR_AND_LENGTH, so that if the string is relocated by GC, we still use correct addresses. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 13:39:00 +0000 +++ src/ChangeLog 2014-01-29 17:52:16 +0000 @@ -1,3 +1,9 @@ +2014-01-29 Eli Zaretskii + + * print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE, not + STRING_CHAR_AND_LENGTH, so that if the string is relocated by GC, + we still use correct addresses. (Bug#16576) + 2014-01-27 K. Handa Fix bug#16286 by the different way than revno:116158 to preserve === modified file 'src/print.c' --- src/print.c 2014-01-01 07:43:34 +0000 +++ src/print.c 2014-01-29 17:52:16 +0000 @@ -1389,9 +1389,8 @@ print_string (obj, printcharfun); else { - register ptrdiff_t i_byte; + register ptrdiff_t i, i_byte; struct gcpro gcpro1; - unsigned char *str; ptrdiff_t size_byte; /* 1 means we must ensure that the next character we output cannot be taken as part of a hex character escape. */ @@ -1410,23 +1409,15 @@ } PRINTCHAR ('\"'); - str = SDATA (obj); size_byte = SBYTES (obj); - for (i_byte = 0; i_byte < size_byte;) + for (i = 0, i_byte = 0; i_byte < size_byte;) { /* Here, we must convert each multi-byte form to the corresponding character code before handing it to PRINTCHAR. */ - int len; int c; - if (multibyte) - { - c = STRING_CHAR_AND_LENGTH (str + i_byte, len); - i_byte += len; - } - else - c = str[i_byte++]; + FETCH_STRING_CHAR_ADVANCE (c, obj, i, i_byte); QUIT; ------------------------------------------------------------ revno: 116195 [merge] committer: K. Handa branch nick: trunk timestamp: Wed 2014-01-29 22:39:42 +0900 message: Fix bug#16286 by the different way than revno:116158 to preserve the code detection behavior of 24.3. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 10:29:14 +0000 +++ src/ChangeLog 2014-01-29 13:39:00 +0000 @@ -1,3 +1,16 @@ +2014-01-27 K. Handa + + Fix bug#16286 by the different way than revno:116158 to preserve + the code detection behavior of 24.3. + + * coding.h (struct coding_system): New member detected_utf8_bytes. + + * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes. + (decode_coding_gap): Use short cut for UTF-8 file reading only + when coding->detected_utf8_bytes equals to coding->src_bytes. + + * fileio.c (Finsert_file_contents): Cancel the previous change. + 2014-01-29 Martin Rudalics * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames === modified file 'src/coding.c' --- src/coding.c 2014-01-26 01:20:24 +0000 +++ src/coding.c 2014-01-29 13:21:25 +0000 @@ -1300,6 +1300,7 @@ means that we found a valid non-ASCII characters. */ detect_info->found |= CATEGORY_MASK_UTF_8_AUTO | CATEGORY_MASK_UTF_8_NOSIG; } + coding->detected_utf8_bytes = src_base - coding->source; coding->detected_utf8_chars = nchars; return 1; } @@ -7890,7 +7891,7 @@ coding->dst_multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); coding->head_ascii = -1; - coding->detected_utf8_chars = -1; + coding->detected_utf8_bytes = coding->detected_utf8_chars = -1; coding->eol_seen = EOL_SEEN_NONE; if (CODING_REQUIRE_DETECTION (coding)) detect_coding (coding); @@ -7907,7 +7908,8 @@ if (chars != bytes) { /* There exists a non-ASCII byte. */ - if (EQ (CODING_ATTR_TYPE (attrs), Qutf_8)) + if (EQ (CODING_ATTR_TYPE (attrs), Qutf_8) + && coding->detected_utf8_bytes == coding->src_bytes) { if (coding->detected_utf8_chars >= 0) chars = coding->detected_utf8_chars; === modified file 'src/coding.h' --- src/coding.h 2014-01-26 01:20:24 +0000 +++ src/coding.h 2014-01-29 13:21:25 +0000 @@ -468,7 +468,9 @@ the eol format. */ ptrdiff_t head_ascii; - ptrdiff_t detected_utf8_chars; + /* How many bytes/chars at the source are detected as valid utf-8 + sequence. Set by detect_coding_utf_8. */ + ptrdiff_t detected_utf8_bytes, detected_utf8_chars; /* Used internally in coding.c. See the comment of detect_ascii. */ int eol_seen; === modified file 'src/fileio.c' --- src/fileio.c 2014-01-26 00:32:30 +0000 +++ src/fileio.c 2014-01-29 13:21:25 +0000 @@ -4298,7 +4298,6 @@ 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: 116194 committer: martin rudalics branch nick: trunk timestamp: Wed 2014-01-29 11:29:14 +0100 message: In x_set_tool_bar_lines of w32fns.c don't clear area on frames that are not visible. * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames that are not visible. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 08:23:59 +0000 +++ src/ChangeLog 2014-01-29 10:29:14 +0000 @@ -1,3 +1,8 @@ +2014-01-29 Martin Rudalics + + * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames + that are not visible. + 2014-01-29 Jan Djärv * xmenu.c (create_and_show_popup_menu): Handle case when no key === modified file 'src/w32fns.c' --- src/w32fns.c 2014-01-25 14:39:49 +0000 +++ src/w32fns.c 2014-01-29 10:29:14 +0000 @@ -1713,7 +1713,7 @@ /* If the tool bar gets smaller, the internal border below it has to be cleared. It was formerly part of the display of the larger tool bar, and updating windows won't clear it. */ - if (FRAME_INTERNAL_BORDER_WIDTH (f) != 0) + if (FRAME_INTERNAL_BORDER_WIDTH (f) != 0 && FRAME_VISIBLE_P (f)) { int height = FRAME_INTERNAL_BORDER_WIDTH (f); int width = FRAME_PIXEL_WIDTH (f); ------------------------------------------------------------ revno: 116193 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 00:36:32 -0800 message: * etc/NEWS: Don't use a separate section for single entries diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-29 08:27:55 +0000 +++ etc/NEWS 2014-01-29 08:36:32 +0000 @@ -491,9 +491,7 @@ `electric-pair-text-syntax-table' to tweak pairing behavior inside strings and comments. -** EPA - -*** New option `epa-mail-aliases'. +** New EPA option `epa-mail-aliases'. You can set this to a list of alias expansions for keys to use in `epa-mail-encrypt'. @@ -506,9 +504,7 @@ is `foo@bar.com', ignore that name as regards encryption. This is useful to avoid a query when you have no key for that name. -** ERC - -*** New option `erc-accidental-paste-threshold-seconds'. +** New ERC option `erc-accidental-paste-threshold-seconds'. If set to a number, this can be used to avoid accidentally pasting large amounts of data into the ERC input. @@ -537,9 +533,8 @@ Tramp-using variants can still be used by enabling the eshell-tramp module. -** F90 mode --- -*** New option `f90-smart-end-names'. +** New F90 mode option `f90-smart-end-names'. ** Icomplete is a bit more like Ido. ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.