------------------------------------------------------------ revno: 116080 fixes bug: http://debbugs.gnu.org/16477 committer: Juri Linkov branch nick: trunk timestamp: Mon 2014-01-20 10:52:44 +0200 message: * lisp/saveplace.el (toggle-save-place, save-place-to-alist) (save-places-to-alist, save-place-dired-hook): Add (derived-mode-p 'dired-mode) before checking for dired-directory. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-20 08:45:56 +0000 +++ lisp/ChangeLog 2014-01-20 08:52:44 +0000 @@ -1,5 +1,11 @@ 2014-01-20 Juri Linkov + * saveplace.el (toggle-save-place, save-place-to-alist) + (save-places-to-alist, save-place-dired-hook): Add (derived-mode-p + 'dired-mode) before checking for dired-directory. (Bug#16477) + +2014-01-20 Juri Linkov + * indent.el (indent-line-to): Use backward-to-indentation instead of back-to-indentation. (Bug#16461) === modified file 'lisp/saveplace.el' --- lisp/saveplace.el 2014-01-01 07:43:34 +0000 +++ lisp/saveplace.el 2014-01-20 08:52:44 +0000 @@ -152,7 +152,8 @@ \(setq-default save-place t\)" (interactive "P") - (if (not (or buffer-file-name dired-directory)) + (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode) + dired-directory))) (message "Buffer `%s' not visiting a file or directory" (buffer-name)) (if (and save-place (or (not parg) (<= parg 0))) (progn @@ -172,10 +173,11 @@ ;; will be saved again when Emacs is killed. (or save-place-loaded (load-save-place-alist-from-file)) (let ((item (or buffer-file-name - (and dired-directory - (if (consp dired-directory) - (expand-file-name (car dired-directory)) - (expand-file-name dired-directory)))))) + (and (derived-mode-p 'dired-mode) + dired-directory + (expand-file-name (if (consp dired-directory) + (car dired-directory) + dired-directory)))))) (when (and item (or (not save-place-ignore-files-regexp) (not (string-match save-place-ignore-files-regexp @@ -184,7 +186,8 @@ (position (cond ((eq major-mode 'hexl-mode) (with-no-warnings (1+ (hexl-current-address)))) - (dired-directory + ((and (derived-mode-p 'dired-mode) + dired-directory) (let ((filename (dired-get-filename nil t))) (if filename `((dired-filename . ,filename)) @@ -301,7 +304,8 @@ (with-current-buffer (car buf-list) ;; save-place checks buffer-file-name too, but we can avoid ;; overhead of function call by checking here too. - (and (or buffer-file-name dired-directory) + (and (or buffer-file-name (and (derived-mode-p 'dired-mode) + dired-directory)) (save-place-to-alist)) (setq buf-list (cdr buf-list)))))) @@ -321,9 +325,11 @@ (defun save-place-dired-hook () "Position the point in a dired buffer." (or save-place-loaded (load-save-place-alist-from-file)) - (let ((cell (assoc (if (consp dired-directory) - (expand-file-name (car dired-directory)) - (expand-file-name dired-directory)) + (let ((cell (assoc (and (derived-mode-p 'dired-mode) + dired-directory + (expand-file-name (if (consp dired-directory) + (car dired-directory) + dired-directory))) save-place-alist))) (if cell (progn ------------------------------------------------------------ revno: 116079 fixes bug: http://debbugs.gnu.org/16461 committer: Juri Linkov branch nick: trunk timestamp: Mon 2014-01-20 10:45:56 +0200 message: * lisp/indent.el (indent-line-to): Use backward-to-indentation instead of back-to-indentation. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-20 07:56:28 +0000 +++ lisp/ChangeLog 2014-01-20 08:45:56 +0000 @@ -1,3 +1,8 @@ +2014-01-20 Juri Linkov + + * indent.el (indent-line-to): Use backward-to-indentation + instead of back-to-indentation. (Bug#16461) + 2014-01-20 Paul Eggert Revert some of the CANNOT_DUMP fix (Bug#16494). === modified file 'lisp/indent.el' --- lisp/indent.el 2014-01-15 08:22:41 +0000 +++ lisp/indent.el 2014-01-20 08:45:56 +0000 @@ -265,7 +265,7 @@ "Indent current line to COLUMN. This function removes or adds spaces and tabs at beginning of line only if necessary. It leaves point at end of indentation." - (back-to-indentation) + (backward-to-indentation 0) (let ((cur-col (current-column))) (cond ((< cur-col column) (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width) @@ -274,7 +274,7 @@ (indent-to column)) ((> cur-col column) ; too far right (after tab?) (delete-region (progn (move-to-column column t) (point)) - (progn (back-to-indentation) (point))))))) + (progn (backward-to-indentation 0) (point))))))) (defun current-left-margin () "Return the left margin to use for this line. ------------------------------------------------------------ revno: 116078 committer: Paul Eggert branch nick: trunk timestamp: Mon 2014-01-20 00:15:16 -0800 message: Spelling fix. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-20 01:21:18 +0000 +++ etc/NEWS 2014-01-20 08:15:16 +0000 @@ -748,7 +748,7 @@ ** New SES command `ses-rename-cell' allows assigning names to SES cells. --- -** The shell.el option `explcit-bash-args' includes --noediting by default. +** The shell.el option `explicit-bash-args' includes --noediting by default. All non-ancient Bash versions support this option. ** Shell Script mode ------------------------------------------------------------ revno: 116077 fixes bug: http://debbugs.gnu.org/16494 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-01-19 23:56:28 -0800 message: Revert some of the CANNOT_DUMP fix. Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes, but fixing this can wait until after the next release. * leim/Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty. * lisp/Makefile.in (emacs): Keep EMACSLOADPATH empty. * src/lread.c (init_lread): Fix typo: NILP, not !NILP. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2014-01-17 01:54:23 +0000 +++ leim/ChangeLog 2014-01-20 07:56:28 +0000 @@ -1,3 +1,8 @@ +2014-01-20 Paul Eggert + + Revert some of the CANNOT_DUMP fix (Bug#16494). + * Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty. + 2013-12-27 Paul Eggert Sync better from sources. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2014-01-01 07:43:34 +0000 +++ leim/Makefile.in 2014-01-20 07:56:28 +0000 @@ -34,8 +34,8 @@ EMACS = ../src/emacs # How to run Emacs. -RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \ - -batch --no-site-file --no-site-lisp +# Prevent any setting of EMACSLOADPATH in user environment causing problems. +RUN_EMACS = EMACSLOADPATH= '$(EMACS)' -batch --no-site-file --no-site-lisp MKDIR_P = @MKDIR_P@ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-19 13:23:18 +0000 +++ lisp/ChangeLog 2014-01-20 07:56:28 +0000 @@ -1,3 +1,10 @@ +2014-01-20 Paul Eggert + + Revert some of the CANNOT_DUMP fix (Bug#16494). + Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes, + but fixing this can wait until after the next release. + * Makefile.in (emacs): Keep EMACSLOADPATH empty. + 2014-01-19 Michael Albinus * eshell/esh-mode.el (eshell-password-prompt-regexp): === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2014-01-01 07:43:34 +0000 +++ lisp/Makefile.in 2014-01-20 07:56:28 +0000 @@ -89,7 +89,8 @@ BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" # Set load-prefer-newer for the benefit of the non-bootstrappers. -BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS) +BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \ + --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS) # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. They're ordered by size, so we use @@ -106,7 +107,8 @@ $(lisp)/emacs-lisp/autoload.elc # The actual Emacs command run in the targets below. -emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT) +# Prevent any setting of EMACSLOADPATH in user environment causing problems. +emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT) # Common command to find subdirectories setwins=for file in `find . -type d -print`; do \ === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-19 15:42:48 +0000 +++ src/ChangeLog 2014-01-20 07:56:28 +0000 @@ -1,3 +1,8 @@ +2014-01-20 Paul Eggert + + Revert some of the CANNOT_DUMP fix (Bug#16494). + * lread.c (init_lread): Fix typo: NILP, not !NILP. + 2014-01-19 Eli Zaretskii * w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w) === modified file 'src/lread.c' --- src/lread.c 2014-01-03 06:47:27 +0000 +++ src/lread.c 2014-01-20 07:56:28 +0000 @@ -4345,7 +4345,7 @@ #ifdef CANNOT_DUMP bool use_loadpath = true; #else - bool use_loadpath = !NILP (Vpurify_flag); + bool use_loadpath = NILP (Vpurify_flag); #endif if (use_loadpath && egetenv ("EMACSLOADPATH")) @@ -4388,7 +4388,7 @@ } } /* Fmemq (Qnil, Vload_path) */ } - else /* Vpurify_flag || !EMACSLOADPATH */ + else { Vload_path = load_path_default (); @@ -4405,7 +4405,7 @@ sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); if (! NILP (sitelisp)) Vload_path = nconc2 (sitelisp, Vload_path); } - } /* !Vpurify_flag && EMACSLOADPATH */ + } Vvalues = Qnil; ------------------------------------------------------------ revno: 116076 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-01-19 17:21:18 -0800 message: * etc/NEWS: Small edits diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-20 00:54:19 +0000 +++ etc/NEWS 2014-01-20 01:21:18 +0000 @@ -54,11 +54,11 @@ decompress gzip- and zlib-format compressed data. --- -** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support. -pkg-config is required to find ImageMagick libraries. +** Emacs for NS (Mac OS X, GNUstep) can be built with ImageMagick support. +This requires pkg-config to be available at configure time. -** For OSX >= 10.5, the Core text based font backend from the Mac port is used. -For GNUStep and OSX 10.4 the old backend is used. +** New Core Text based font backend for Mac OS X 10.5 and newer. +GNUstep and Mac OS X 10.4 use the old font backend. To use the old backend by default, do on the command line: % defaults write org.gnu.Emacs FontBackend ns @@ -164,25 +164,24 @@ +++ *** The key `?' now describes prefix bindings, like `C-h'. -*** The command `describe-function' was extended for EIEIO. +*** The command `describe-function' has been extended for EIEIO. Running it on constructors will show a full description of the generated class. For generic functions, it will show all implementations together with links to the source. The old commands `describe-class', `describe-constructor' and `describe-generic' were removed. -*** The command `quail-help' is deleted. Use `C-h C-\' -(`describe-input-method') instead. +*** The command `quail-help' has been removed. +Use `C-h C-\' (`describe-input-method') instead. ** ImageMagick +++ -*** ImageMagick images now support the :max-width and :max-height -keywords. +*** ImageMagick images now support the :max-width and :max-height keywords. -*** Some data types aren't auto-detected by ImageMagick. Adding -:format to `create-image' may help if the content type is in the -new variable `image-format-suffixes'. +*** Some data types aren't auto-detected by ImageMagick. +Adding :format to `create-image' may help if the content type is in +the new variable `image-format-suffixes'. ** Frame and window changes @@ -228,22 +227,27 @@ +++ ** `cache-long-line-scans' has been renamed to `cache-long-scans' because it affects caching of paragraph scanning results as well. +Also, it is now enabled by default. --- ** The option `set-mark-default-inactive' has been deleted. This unfinished feature was introduced by accident in Emacs 23.1; simply disabling Transient Mark mode does the same thing. -** The default value of `comment-use-global-state' is changed to t, +** The default value of `comment-use-global-state' is now t, and this variable has been marked obsolete. +--- +** `emacs-bzr-version' has been renamed to `emacs-repository-version', +and works for git too. + ** New user options: *** `read-regexp-defaults-function' defines a function to read regexps, -used by commands like `rgrep', `lgrep' `occur', `highlight-regexp', -etc. You can customize this to specify a function that provides a -default value from the regexp last history element, or from the symbol -found at point. +used by commands like `rgrep', `lgrep' `occur', `highlight-regexp', etc. +You can customize this to specify a function that provides a default +value from the regexp last history element, or from the symbol found +at point. +++ *** `load-prefer-newer', affects how the `load' function chooses the @@ -252,10 +256,6 @@ which one to load, then the newer file is loaded. The default, nil, means to always load the .elc file. ---- -** `emacs-bzr-version' has been renamed to `emacs-repository-version', -and works for git too. - * Editing Changes in Emacs 24.4 @@ -271,7 +271,7 @@ *** `electric-indent-mode' is enabled by default. *** `tab-stop-list' is now implicitly extended to infinity by repeating -the last step. Its default value is changed to nil which means a tab +the last step. Its default value is changed to nil, which means a tab stop every `tab-width' columns. ** Filling changes @@ -288,7 +288,7 @@ (add-hook 'fill-nobreak-predicate 'fill-single-char-nobreak-p) +++ -** Uniquify is enabled by default with `post-forward-angle-brackets' style. +** Uniquify is enabled by default, with `post-forward-angle-brackets' style. ** New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region. Most commands are still unaware of it, but kill/yank do work on the rectangle. @@ -468,37 +468,31 @@ ** Eldoc Mode works properly in the minibuffer. ** Electric Pair mode -*** New `electric-pair-preserve-balance' enabled by default. -Pairing/skipping only kicks in when that help the balance of -parentheses and quotes, i.e. the buffer should end up at least as +*** New option `electric-pair-preserve-balance', enabled by default. +If non-nil, pairing/skipping only kicks in when that help the balance +of parentheses and quotes, i.e. the buffer should end up at least as balanced as before. You can further control this behavior by adjusting the predicates -stored in `electric-pair-inhibit-predicate' and -`electric-pair-skip-self'. - -*** New `electric-pair-delete-adjacent-pairs' enabled by default. - +stored in `electric-pair-inhibit-predicate' and `electric-pair-skip-self'. + +*** New option `electric-pair-delete-adjacent-pairs', enabled by default. In `electric-pair-mode', the commands `backward-delete-char' and `backward-delete-char-untabify' are now bound to electric variants that delete the closer when invoked between adjacent pairs. -*** New `electric-pair-open-newline-between-pairs' enabled by default. - +*** New option `electric-pair-open-newline-between-pairs', enabled by default. In `electric-pair-mode', inserting a newline between adjacent pairs opens an extra newline after point, which is indented if `electric-indent-mode' is also set. -*** New `electric-pair-skip-whitespace' enabled by default. - -Controls if skipping over closing delimiters should jump over any -whitespace slack. Setting it to `chomp' makes it delete this -whitespace. See also the variable -`electric-pair-skip-whitespace-chars'. +*** New option `electric-pair-skip-whitespace', enabled by default. +This controls if skipping over closing delimiters should jump over any +whitespace slack. Setting it to `chomp' makes it delete this +whitespace. See also the variable `electric-pair-skip-whitespace-chars'. *** New variables control the pairing in strings and comments. - You can customize `electric-pair-text-pairs' and `electric-pair-text-syntax-table' to tweak pairing behavior inside strings and comments. @@ -506,7 +500,6 @@ ** EPA *** New option `epa-mail-aliases'. - You can set this to a list of alias expansions for keys to use in `epa-mail-encrypt'. @@ -526,15 +519,13 @@ amounts of data into the ERC input. +++ -** ERT - -*** New macro `skip-unless' allows skipping ERT tests. +** New ERT macro `skip-unless' allows skipping ERT tests. See the ERT manual for details. ** Eshell +++ -*** `eshell' now supports visual subcommands and options +*** `eshell' now supports visual subcommands and options. Eshell has been able to handle "visual" commands (interactive, non-line oriented commands such as top that require display capabilities not provided by eshell) by running them in an Emacs @@ -542,12 +533,12 @@ This feature has been extended to subcommands and options that make a usually line-oriented command a visual command. Typical examples are -"git log" and "git --help" which display their output in a +"git log" and "git --help", which display their output in a pager by default. See `eshell-visual-subcommands' and `eshell-visual-options'. --- -*** Added Eshell-Tramp module +*** New Eshell-Tramp module. External su and sudo commands are now the default; the internal, Tramp-using variants can still be used by enabling the eshell-tramp module. @@ -558,11 +549,11 @@ ** Icomplete is a bit more like Ido. -*** key bindings to navigate through and select the completions. +*** Key bindings to navigate through and select the completions. *** The icomplete-separator is customizable, and its default has changed. -*** Removed icomplete-show-key-bindings. +*** Removed `icomplete-show-key-bindings'. *** Icomplete-mode by defaults applies to all forms of minibuffer completion. (setq icomplete-with-completion-tables '(internal-complete-buffer)) @@ -610,13 +601,10 @@ highlights the symbol found near point without prompting, using the next face automatically. -** Imenu - -*** New option `imenu-generic-skip-comments-and-strings'. - -** Info +** New Imenu option `imenu-generic-skip-comments-and-strings'. + --- -*** New face `info-index-match' is used to highlight matches in index +** New Info face `info-index-match', used to highlight matches in index entries displayed by `Info-index-next', `Info-virtual-index' and `info-apropos'. @@ -636,18 +624,24 @@ +++ ** Octave mode -*** Font locking for texinfo comments and new keywords -*** Completion in Octave file buffers -*** Eldoc support -*** Jump to definition -*** Documentation lookup/search -*** Code cleanup and various bug fixes + +*** Font locking for texinfo comments and new keywords. + +*** Completion in Octave file buffers. + +*** Eldoc support. + +*** Jump to definition. + +*** Documentation lookup/search. ** OPascal mode is the new name for Delphi mode. *** All delphi-* variables and functions have been renamed to opascal-*. + *** `delphi-newline-always-indents' is not supported any more. Use `electric-indent-mode' instead. + *** `delphi-tab' is gone, replaced by `indent-for-tab-command'. ** Package @@ -666,29 +660,25 @@ *** In the *Packages* buffer, `f' or the Package->Filter menu filters the packages by a keyword. -** Prolog mode - -*** `prolog-use-smie' has been removed, along with the non-SMIE -indentation code. +--- +** In Prolog mode, `prolog-use-smie' has been removed, +along with the non-SMIE indentation code. ** Remember -*** The new command `remember-notes' creates a buffer which is saved -on `kill-emacs'. - -You may think of it as a *scratch* buffer whose content is preserved. -In fact, it was designed as a replacement for *scratch* buffer and can -be used that way by setting `initial-buffer-choice' to +*** The new command `remember-notes' creates a buffer that is saved on +`kill-emacs'. You can think of it as a *scratch* buffer whose content +is preserved. In fact, it was designed as a replacement for *scratch* +buffer and can be used that way by setting `initial-buffer-choice' to `remember-notes' and `remember-notes-buffer-name' to "*scratch*". -Without the second change, *scratch* buffer will still be there for -notes that do not need to be preserved. +Without the second change, the *scratch* buffer will still be there +for notes that do not need to be preserved. *** The Remember package can now store notes in separates files. You can use the new function `remember-store-in-files' within the -`remember-handler-functions' option. - -See `remember-data-directory' and `remember-directory-file-name-format' -for new options related to this function. +`remember-handler-functions' option. See `remember-data-directory' +and `remember-directory-file-name-format' for new options related to +this function. ** Rmail @@ -705,11 +695,9 @@ *** New option `ruby-custom-encoding-magic-comment-template'. -*** New mode menu. - *** Improved syntax highlighting and indentation. -*** Add more Ruby file types to `auto-mode-alist'. +*** More Ruby file types have been added to `auto-mode-alist'. *** New option `ruby-align-to-stmt-keywords'. @@ -757,16 +745,11 @@ that it matches symbols, and non-symbol characters between symbols. +++ -** SES - -*** New command `ses-rename-cell' allows assigning names to SES cells. - -** Shell +** New SES command `ses-rename-cell' allows assigning names to SES cells. + --- -*** `explicit-bash-args' now always defaults to use --noediting. -During initialization, Emacs no longer expends a process to decide -whether it is safe to use Bash's --noediting option. These days ---noediting is ubiquitous; it was introduced in 1996 in Bash version 2. +** The shell.el option `explcit-bash-args' includes --noediting by default. +All non-ancient Bash versions support this option. ** Shell Script mode @@ -778,9 +761,7 @@ Emacs can learn the appropriate indentation settings if you provide it with an indented sample file. -** Term mode - -*** New option `term-suppress-hard-newline'. +** New Term mode option `term-suppress-hard-newline'. ** Todo mode has been rewritten and enhanced. New features include: @@ -867,9 +848,7 @@ --- *** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'. -** Woman - -*** The commands `woman-default-faces' and `woman-monochrome-faces' +** The Woman commands `woman-default-faces' and `woman-monochrome-faces' are obsolete. Customize the `woman-*' faces instead. ** Obsolete packages: @@ -1355,11 +1334,11 @@ file locking, customize `create-lockfiles' to nil. ** Improved fullscreen support on Mac OS X. -Both native (>= OSX 10.7) and "old style" fullscreen are supported. +Both native (>= Mac OS X 10.7) and "old style" fullscreen are supported. Customize `ns-use-native-fullscreen' to change style. For >= 10.7 native is the default. -** OSX >= 10.7 can use sRGB colorspace. +** Mac OS X >= 10.7 can use sRGB colorspace. Customize `ns-use-srgb-colorspace' to change style. t is the default. Note: This does not apply to images. ------------------------------------------------------------ revno: 116075 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-01-19 16:54:19 -0800 message: * etc/NEWS: Small edits diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-12 16:50:54 +0000 +++ etc/NEWS 2014-01-20 00:54:19 +0000 @@ -62,10 +62,6 @@ To use the old backend by default, do on the command line: % defaults write org.gnu.Emacs FontBackend ns -** If your Emacs was built from a repository checkout, the new variable -`emacs-repository-version' contains information about the bzr revision used. -In 24.3 this variable was `emacs-bzr-version`. - * Startup Changes in Emacs 24.4 @@ -256,6 +252,10 @@ which one to load, then the newer file is loaded. The default, nil, means to always load the .elc file. +--- +** `emacs-bzr-version' has been renamed to `emacs-repository-version', +and works for git too. + * Editing Changes in Emacs 24.4 @@ -522,7 +522,7 @@ ** ERC *** New option `erc-accidental-paste-threshold-seconds'. -If set to a number, this can be used to avoid accidentally paste large +If set to a number, this can be used to avoid accidentally pasting large amounts of data into the ERC input. +++ @@ -770,14 +770,13 @@ ** Shell Script mode -*** `sh-mode' now has the mode own `add-log-current-defun-function'. -You can pick the name of the function and the variables with `C-x 4 a'. +*** `sh-mode' now has its own setting for `add-log-current-defun-function'. *** The SMIE indentation engine is now used by default. ** SMIE indentation can be customized via `smie-config'. -The customization can be guessed by Emacs by providing a sample indented -file and letting SMIE learn from it. +Emacs can learn the appropriate indentation settings if you provide it +with an indented sample file. ** Term mode @@ -814,7 +813,7 @@ ** Tramp -*** The experimental url syntax for remote file names is withdrawn. +*** The experimental url syntax for remote file names has been removed. +++ *** New connection method "adb", which allows to access Android @@ -862,8 +861,10 @@ ** VHDL mode +--- *** New options: `vhdl-actual-generic-name', `vhdl-beautify-options'. +--- *** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'. ** Woman @@ -900,10 +901,9 @@ ** New package `eww' is a built-in web browser. It is only available if Emacs is compiled with libxml2 support. -** New minor mode `superword-mode', defined in subword.el -`superword-mode' overrides the default word motion commands to treat -symbol_words as a single word, similar to what `subword-mode' does and -using the same internal functions. +** New minor mode `superword-mode'. +This overrides the default word motion commands to treat "symbol_words" +as a single word, similar to what `subword-mode' does. +++ ** New package nadvice.el offers lighter-weight advice facilities. @@ -928,18 +928,19 @@ * Incompatible Lisp Changes in Emacs 24.4 --- -** `kill-region' lost its `yank-handler' optional argument. +** `kill-region' has lost its `yank-handler' optional argument. +++ -** `(input-pending-p)' no longer runs other timers which are ready to -run. The new optional CHECK-TIMERS param allows for the prior behavior. +** `(input-pending-p)' no longer runs other timers that are ready to run. +The new optional CHECK-TIMERS parameter allows for the prior behavior. +++ ** `defvar' and `defcustom' in a let-binding affect the "external" default. --- -** The syntax of ?» and ?« is now punctuation instead of matched parens. -Some languages match those as »...« and others as «...» so better stay neutral. +** The syntax of ?» and ?« is now punctuation instead of matched parens. +Some languages match those as »...«, and others as «...», so it is +better for Emacs to stay neutral by default. --- ** In compiled Lisp files, the header no longer includes a timestamp. @@ -958,7 +959,7 @@ whereas now it simply has higher precedence. ** Default process filters and sentinels are not nil any more. -Instead they default to a function which does what the nil value used to do. +Instead they default to a function that does what the nil value used to do. +++ ** `read-event' does not return decoded chars in ttys any more. @@ -968,11 +969,11 @@ done before input-decode-map, function-key-map, etc. --- -** Removed `inhibit-local-menu-bar-menus'. +** The option `inhibit-local-menu-bar-menus' has been removed. --- ** Frame-local variables that affect redisplay do not work any more. -More specifically, the redisplay does not bother to check for a frame-local +More specifically, redisplay does not bother to check for a frame-local value when looking up variables. +++ @@ -1088,7 +1089,7 @@ *** `bool-vector-count-population' +++ -** Comparison functions =, <, >, <=, >= now take many arguments. +** Comparison functions =, <, >, <=, >= can now take many arguments. ** Error-handling changes @@ -1098,7 +1099,8 @@ *** `with-demoted-errors' takes an additional argument `format'. +++ -** New macro with-eval-after-load. Like eval-after-load, but better behaved. +** New macro `with-eval-after-load'. +This is like the old `eval-after-load', but better behaved. ** New library subr-x.el for misc helper functions +++ @@ -1178,7 +1180,7 @@ argument, with the same interpretation as the returned value of `visited-file-modtime'. -** Changes in autorevert.el +** Autorevert changes --- *** If Emacs is compiled with file notification support, notifications ------------------------------------------------------------ revno: 116074 committer: martin rudalics branch nick: trunk timestamp: Sun 2014-01-19 17:59:51 +0100 message: Extend last fix of term-window-width (Bug#16470). diff: === modified file 'lisp/term.el' --- lisp/term.el 2014-01-19 09:24:26 +0000 +++ lisp/term.el 2014-01-19 16:59:51 +0000 @@ -977,7 +977,7 @@ (/= (frame-parameter nil 'right-fringe) 0)) ;; Call window-text-width instead of window-width (Bug#16470). (window-text-width) - (1- (window-width)))) + (1- (window-text-width)))) (put 'term-mode 'mode-class 'special) ------------------------------------------------------------ revno: 116073 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-01-19 17:42:48 +0200 message: Fix Cygwin w32 build broken by last commit in w32font.c. src/w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w) (get_text_metrics_w, get_glyph_outline_w, get_char_width_32_w) [!WINDOWSNT]: These functions are no longer compiled on Cygwin; they are replaced by macros that expand into direct calls to the corresponding functions from GDI32.DLL. (globals_of_w32font) [WINDOWSNT]: Don't initialize g_b_* static variables in the Cygwin build, they are unused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-19 13:26:21 +0000 +++ src/ChangeLog 2014-01-19 15:42:48 +0000 @@ -1,3 +1,13 @@ +2014-01-19 Eli Zaretskii + + * w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w) + (get_text_metrics_w, get_glyph_outline_w, get_char_width_32_w) + [!WINDOWSNT]: These functions are no longer compiled on Cygwin; + they are replaced by macros that expand into direct calls to the + corresponding functions from GDI32.DLL. + (globals_of_w32font) [WINDOWSNT]: Don't initialize g_b_* static + variables in the Cygwin build, they are unused. + 2014-01-19 K. Handa * composite.c (composition_update_it): Fix previous change. === modified file 'src/w32font.c' --- src/w32font.c 2014-01-18 11:46:22 +0000 +++ src/w32font.c 2014-01-19 15:42:48 +0000 @@ -147,6 +147,8 @@ style variations if the font name is not specified. */ static void list_all_matching_fonts (struct font_callback_data *); +#ifdef WINDOWSNT + static BOOL g_b_init_get_outline_metrics_w; static BOOL g_b_init_get_text_metrics_w; static BOOL g_b_init_get_glyph_outline_w; @@ -244,8 +246,8 @@ lpvBuffer, lpmat2); } -static DWORD WINAPI get_char_width_32_w (HDC hdc, UINT uFirstChar, - UINT uLastChar, LPINT lpBuffer) +static DWORD WINAPI +get_char_width_32_w (HDC hdc, UINT uFirstChar, UINT uLastChar, LPINT lpBuffer) { static GetCharWidth32W_Proc s_pfn_Get_Char_Width_32W = NULL; HMODULE hm_unicows = NULL; @@ -261,6 +263,18 @@ return s_pfn_Get_Char_Width_32W (hdc, uFirstChar, uLastChar, lpBuffer); } +#else /* Cygwin */ + +/* Cygwin doesn't support Windows 9X, and links against GDI32.DLL, so + it can just call these functions directly. */ +#define get_outline_metrics_w(h,d,o) GetOutlineTextMetricsW(h,d,o) +#define get_text_metrics_w(h,t) GetTextMetricsW(h,t) +#define get_glyph_outline_w(h,uc,f,gm,b,v,m) \ + GetGlyphOutlineW(h,uc,f,gm,b,v,m) +#define get_char_width_32_w(h,fc,lc,b) GetCharWidth32W(h,fc,lc,b) + +#endif /* Cygwin */ + static int memq_no_quit (Lisp_Object elt, Lisp_Object list) { @@ -2717,8 +2731,10 @@ void globals_of_w32font (void) { +#ifdef WINDOWSNT g_b_init_get_outline_metrics_w = 0; g_b_init_get_text_metrics_w = 0; g_b_init_get_glyph_outline_w = 0; g_b_init_get_char_width_32_w = 0; +#endif } ------------------------------------------------------------ revno: 116072 [merge] committer: K. Handa branch nick: trunk timestamp: Sun 2014-01-19 22:28:16 +0900 message: composite.c (composition_update_it): Fix previous change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-18 11:46:22 +0000 +++ src/ChangeLog 2014-01-19 13:26:21 +0000 @@ -1,3 +1,7 @@ +2014-01-19 K. Handa + + * composite.c (composition_update_it): Fix previous change. + 2014-01-18 Eli Zaretskii Fix file name handling on MS-Windows 9X. === modified file 'src/composite.c' --- src/composite.c 2014-01-12 23:23:55 +0000 +++ src/composite.c 2014-01-19 13:26:21 +0000 @@ -1412,7 +1412,7 @@ cmp_it->width = 0; for (i = cmp_it->nchars - 1; i >= 0; i--) { - c = XINT (LGSTRING_CHAR (gstring, cmp_it->from + i)); + c = XINT (LGSTRING_CHAR (gstring, from + i)); cmp_it->nbytes += CHAR_BYTES (c); cmp_it->width += CHAR_WIDTH (c); } ------------------------------------------------------------ revno: 116071 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-01-19 14:23:18 +0100 message: * eshell/esh-mode.el (eshell-password-prompt-regexp): Use `password-word-equivalents'. (eshell-watch-for-password-prompt): Let-bind `case-fold-search' to t. (Bug#5664, Bug#13124) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-19 12:32:47 +0000 +++ lisp/ChangeLog 2014-01-19 13:23:18 +0000 @@ -1,3 +1,10 @@ +2014-01-19 Michael Albinus + + * eshell/esh-mode.el (eshell-password-prompt-regexp): + Use `password-word-equivalents'. + (eshell-watch-for-password-prompt): Let-bind `case-fold-search' + to t. (Bug#5664, Bug#13124) + 2014-01-19 Alan Mackenzie Bind open-paren-in-column-0-is-defun-start to nil at some entry @@ -30,8 +37,8 @@ 2014-01-17 Michael Albinus - * net/tramp.el (tramp-password-prompt-regexp): Use - `password-word-equivalents' if available. + * net/tramp.el (tramp-password-prompt-regexp): + Use `password-word-equivalents' if available. (tramp-action-password, tramp-process-one-action) (tramp-read-passwd): Let-bind `case-fold-search' to t. (Bug#13124) === modified file 'lisp/eshell/esh-mode.el' --- lisp/eshell/esh-mode.el 2014-01-13 22:21:32 +0000 +++ lisp/eshell/esh-mode.el 2014-01-19 13:23:18 +0000 @@ -182,7 +182,7 @@ :group 'eshell-mode) (defcustom eshell-password-prompt-regexp - "[Pp]ass\\(word\\|phrase\\).*:\\s *\\'" + (format "\\(%s\\).*:\\s *\\'" (regexp-opt password-word-equivalents)) "Regexp matching prompts for passwords in the inferior process. This is used by `eshell-watch-for-password-prompt'." :type 'regexp @@ -947,11 +947,12 @@ This function could be in the list `eshell-output-filter-functions'." (when (eshell-interactive-process) (save-excursion - (goto-char eshell-last-output-block-begin) - (beginning-of-line) - (if (re-search-forward eshell-password-prompt-regexp - eshell-last-output-end t) - (eshell-send-invisible))))) + (let ((case-fold-search t)) + (goto-char eshell-last-output-block-begin) + (beginning-of-line) + (if (re-search-forward eshell-password-prompt-regexp + eshell-last-output-end t) + (eshell-send-invisible)))))) (custom-add-option 'eshell-output-filter-functions 'eshell-watch-for-password-prompt) ------------------------------------------------------------ revno: 116070 committer: Alan Mackenzie branch nick: trunk timestamp: Sun 2014-01-19 12:32:47 +0000 message: 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. * progmodes/cc-mode.el (c-before-change, c-after-change) (c-font-lock-fontify-region): Bind it here. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-19 09:24:26 +0000 +++ lisp/ChangeLog 2014-01-19 12:32:47 +0000 @@ -1,3 +1,12 @@ +2014-01-19 Alan Mackenzie + + 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. + * progmodes/cc-mode.el (c-before-change, c-after-change) + (c-font-lock-fontify-region): Bind it here. + 2014-01-19 Martin Rudalics * term.el (term-window-width): Call window-text-width instead of === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2014-01-16 06:24:06 +0000 +++ lisp/progmodes/cc-engine.el 2014-01-19 12:32:47 +0000 @@ -3183,7 +3183,8 @@ ;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value ;; below `here'. To maintain its consistency, we may need to insert a new ;; brace pair. - (let ((here-bol (c-point 'bol here)) + (let (open-paren-in-column-0-is-defun-start + (here-bol (c-point 'bol here)) too-high-pa ; recorded {/(/[ next above here, or nil. dropped-cons ; was the last removed element a brace pair? pa) @@ -3254,6 +3255,7 @@ ;; This function might do hidden buffer changes. (let* ((here (point)) (here-bopl (c-point 'bopl)) + open-paren-in-column-0-is-defun-start strategy ; 'forward, 'backward etc.. ;; Candidate positions to start scanning from: cache-pos ; highest position below HERE already existing in @@ -9370,7 +9372,8 @@ (c-save-buffer-state ((indent-point (point)) (case-fold-search nil) - ;; A whole ugly bunch of various temporary variables. Have + open-paren-in-column-0-is-defun-start + ;; A whole ugly bunch of various temporary variables. Have ;; to declare them here since it's not possible to declare ;; a variable with only the scope of a cond test and the ;; following result clauses, and most of this function is a === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/cc-mode.el 2014-01-19 12:32:47 +0000 @@ -1032,15 +1032,16 @@ (list type marked-id type-pos term-pos (buffer-substring-no-properties type-pos term-pos) - (buffer-substring-no-properties beg end))))))) + (buffer-substring-no-properties beg end))))))) - (if c-get-state-before-change-functions - (mapc (lambda (fn) - (funcall fn beg end)) - c-get-state-before-change-functions)) - ))) - ;; The following must be done here rather than in `c-after-change' because - ;; newly inserted parens would foul up the invalidation algorithm. + (if c-get-state-before-change-functions + (let (open-paren-in-column-0-is-defun-start) + (mapc (lambda (fn) + (funcall fn beg end)) + c-get-state-before-change-functions))) + ))) + ;; The following must be done here rather than in `c-after-change' because + ;; newly inserted parens would foul up the invalidation algorithm. (c-invalidate-state-cache beg)) (defvar c-in-after-change-fontification nil) @@ -1062,7 +1063,7 @@ ;; This calls the language variable c-before-font-lock-functions, if non nil. ;; This typically sets `syntax-table' properties. - (c-save-buffer-state (case-fold-search) + (c-save-buffer-state (case-fold-search open-paren-in-column-0-is-defun-start) ;; When `combine-after-change-calls' is used we might get calls ;; with regions outside the current narrowing. This has been ;; observed in Emacs 20.7. @@ -1178,7 +1179,8 @@ ;; ;; Type a space in the first blank line, and the fontification of the next ;; line was fouled up by context fontification. - (let ((new-beg beg) (new-end end) new-region case-fold-search) + (let ((new-beg beg) (new-end end) new-region case-fold-search + open-paren-in-column-0-is-defun-start) (if c-in-after-change-fontification (setq c-in-after-change-fontification nil) (save-restriction ------------------------------------------------------------ revno: 116069 committer: martin rudalics branch nick: trunk timestamp: Sun 2014-01-19 10:24:26 +0100 message: In term-window-width call window-text-width instead of window-width (Bug#16470). * term.el (term-window-width): Call window-text-width instead of window-width (Bug#16470). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-18 22:23:38 +0000 +++ lisp/ChangeLog 2014-01-19 09:24:26 +0000 @@ -1,3 +1,8 @@ +2014-01-19 Martin Rudalics + + * term.el (term-window-width): Call window-text-width instead of + window-width (Bug#16470). + 2014-01-18 Paul Eggert * simple.el (password-word-equivalents): Remove duplicates. === modified file 'lisp/term.el' --- lisp/term.el 2014-01-01 07:43:34 +0000 +++ lisp/term.el 2014-01-19 09:24:26 +0000 @@ -975,7 +975,8 @@ (display-graphic-p) overflow-newline-into-fringe (/= (frame-parameter nil 'right-fringe) 0)) - (window-width) + ;; Call window-text-width instead of window-width (Bug#16470). + (window-text-width) (1- (window-width)))) ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.