aboutsummaryrefslogtreecommitdiffstats
path: root/lisp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* upstreamJoakim Verona2012-01-2329-268/+714
|\
| * Replace vc-dired references in comments with vc-dir.Glenn Morris2012-01-232-12/+9
| |
| * * lisp/eshell/esh-util.el (pcomplete/ssh): Remove alias. (tiny change)Mike Lamb2012-01-232-2/+2
| | | | | | | | | | | | There is a better pcomplete/ssh defined in pcmpl-unix.el. Fixes: debbugs:10548
| * Handle comments in eshell-read-hosts-file (tiny change)Mike Lamb2012-01-232-1/+6
| | | | | | | | | | | | * lisp/eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines. Fixes: debbugs:10549
| * lisp/subr.el: Rework previous change.Juanma Barranquero2012-01-232-12/+21
| | | | | | | | | | | | | | * lisp/subr.el (display-delayed-warnings): Doc fix. (collapse-delayed-warnings): New function to collapse identical adjacent warnings. (delayed-warnings-hook): Add it.
| * lisp/subr.el (display-delayed-warnings): Collapse identical adjacent messages.Juanma Barranquero2012-01-232-2/+18
| |
| * * net/tramp.el (tramp-action-login): Set connection property "login-as".Michael Albinus2012-01-224-16/+43
| | | | | | | | | | | | | | | | | | | | * net/tramp-cache.el (tramp-dump-connection-properties): Do not dump properties, when "login-as" is set. * net/tramp-sh.el (tramp-methods): Add user spec to "pscp" and "psftp". (tramp-default-user-alist): Don't add "pscp". (tramp-do-copy-or-rename-file-out-of-band): Use connection property "login-as", if set. (Bug#10530)
| * mm-decode.el (mm-interactively-view-part): Fix prompt.Lars Magne Ingebrigtsen2012-01-222-1/+5
| |
| * * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",Michael Albinus2012-01-212-3/+8
| | | | | | | | "plink1" and "psftp". (Bug#10530)
| * merge trunkKenichi Handa2012-01-211365-5834/+16522
| |\
| | * Fix windmove-reference-loc miscalculation.Jérémy Compostella2012-01-212-9/+14
| | |
| | * calc/calc-units.el (math-put-default-units): Don't use "1" as aJay Belanger2012-01-202-9/+15
| | | | | | | | | | | | default unit.
| | * * lisp/international/mule.el (auto-coding-alist): Add .tbz.Glenn Morris2012-01-202-1/+4
| | |
| | * File-local variable fixes.Glenn Morris2012-01-204-124/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/files.el (local-enable-local-variables): Doc fix. (inhibit-local-variables-regexps): Rename from inhibit-first-line-modes-regexps. Keep old name as obsolete alias. Doc fix. Add some extensions from auto-coding-alist. (inhibit-local-variables-suffixes): Rename from inhibit-first-line-modes-suffixes. Doc fix. (inhibit-local-variables-p): New function, extracted from set-auto-mode-1. (set-auto-mode): Doc fix. Respect inhibit-local-variables-regexps. (set-auto-mode-1): Doc fix. Use inhibit-local-variables-p. (hack-local-variables): Doc fix. Make the mode-only case respect enable-local-variables and friends. Respect inhibit-local-variables-regexps for file-locals, but not for directory-locals. (set-visited-file-name): Take account of inhibit-local-variables-regexps. Whether it applies may change as the file name is changed. * lisp/jka-cmpr-hook.el (jka-compr-install): * lisp/jka-compr.el (jka-compr-uninstall): Update for inhibit-first-line-modes-suffixes name change. * etc/NEWS: Mention this change. Fixes: debbugs:10506
| | * In make-help-screen make original minor-mode-map-alist temporarily visible.Martin Rudalics2012-01-202-3/+11
| | | | | | | | | | | | | | | * help-macro.el (make-help-screen): Temporarily restore original binding for minor-mode-map-alist (Bug#10454).
| | * color.el (color-name-to-rgb): Use the white color to find the max color ↵Julien Danjou2012-01-192-1/+10
| | | | | | | | | | | | | | | | | | component value and return correctly computed values. (color-name-to-rgb): Add missing float conversion for max value.
| | * Fix handling of persistent window parameters.Martin Rudalics2012-01-192-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (save_window_save, Fcurrent_window_configuration) (Vwindow_persistent_parameters): Do not use Qstate. Rewrite doc-strings. * window.el (window--state-get-1, window-state-get): Do not use special state value for window-persistent-parameters. Rename argument IGNORE to WRITABLE. Rewrite doc-string. (window--state-put-2): Reset all window parameters to nil before assigning values of persistent parameters. * windows.texi (Window Configurations): Rewrite references to persistent window parameters. (Window Parameters): Fix description of persistent window parameters.
| | * Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.Glenn Morris2012-01-182-2/+3
| | |\
| | | * Revert unintentional addition of 2012 to Ecma copyright years.Glenn Morris2012-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | This was done by mistake in emacs-23 2010-06-25T08:19:11Z!agustin.martin@hispalinux.es, and then propagated to one more file in 2010-06-26T12:01:31Z!eliz@gnu.org.
| | | * Fix python-wy.el copyright header.Chong Yidong2012-01-181-2/+4
| | | |
| | | * Bump version to 23.3.90.Chong Yidong2012-01-152-711/+717
| | | | | | | | | | | | | | | | Regenerate ldefs-boot.el and AUTHORS.
| | | * Some copyright header fixes for grammar files.Chong Yidong2012-01-152-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * etc/grammars/wisent-grammar.el: Make the Python copyright the literally required one. * lisp/cedet/semantic/wisent/python-wy.el: Regenerate. * lisp/cedet/semantic/wisent/js-wy.el: Add missing copyright header Suggested by Glenn Morris.
| | | * * configure.in: Add i386 to cpp_undefs (Bug#8497).Glenn Morris2012-01-126-15/+15
| | | |
| | | * Add 2012 to FSF copyright years for Emacs files (do not merge to trunk)Glenn Morris2012-01-101296-1302/+1302
| | | |
| | | * Update short copyright year to 2012 (do not merge to trunk)Glenn Morris2012-01-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) <emacs_copyright>: * lib-src/etags.c (print_version) <emacs_copyright>: * lib-src/rcs2log (Copyright): * lisp/version.el (emacs-copyright): * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Update short copyright year to 2012.
| | * | Update ChangeLog.Alan Mackenzie2012-01-181-0/+24
| | | |
| | * | Eliminate sluggishness and hangs in fontification of "semicolon deserts".Alan Mackenzie2012-01-182-23/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc-engine.el (c-state-nonlit-pos-interval): change value 10000 -> 3000. (c-state-safe-place): Reformulate so it doesn't stack up an infinite number of wrong entries in c-state-nonlit-pos-cache. (c-determine-limit-get-base, c-determine-limit): New functions to determine backward search limits disregarding literals. (c-find-decl-spots): Amend commenting. (c-cheap-inside-bracelist-p): New function which detects "={". cc-fonts.el (c-make-font-lock-BO-decl-search-function): Give a limit to a backward search. (c-font-lock-declarations): Fix an occurrence of point being undefined. Check additionally for point being in a bracelist or near a macro invocation without a semicolon so as to avoid a fruitless time consuming search for a declarator. Give a more precise search limit for declarators using the new c-determine-limit.
| | * | Merge from trunk.Alan Mackenzie2012-01-187-76/+172
| | |\ \
| | | * | files.el doc fixes.Glenn Morris2012-01-172-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/files.el (auto-mode-alist, inhibit-first-line-modes-regexps) (set-auto-mode): Doc fixes.
| | | * | * dired.el (dired-build-subdir-alist): Use string-match-p in previous change.Glenn Morris2012-01-171-1/+1
| | | | |
| | | * | * lisp/dired.el (dired-build-subdir-alist): Restrict previous change.Glenn Morris2012-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | (to only file names containing "\"s)
| | | * | * lisp/isearch.el (search-nonincremental-instead): Fix doc typo.Glenn Morris2012-01-172-1/+3
| | | | |
| | | * | Dired fixes for newlines in directory names.Glenn Morris2012-01-172-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name.
| | | * | Update the ChangeLog.Alan Mackenzie2012-01-171-0/+11
| | | | |
| | | * | * net/tramp.el (tramp-local-end-of-line): New defcustom.Michael Albinus2012-01-172-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | (tramp-action-login, tramp-action-yesno, tramp-action-yn) (tramp-action-terminal): Use it. (Bug#10530)
| | * | | Merge.Alan Mackenzie2012-01-1510-60/+265
| | |\ \ \
| | * | | | Fix filling for when filladapt mode is enabled.Alan Mackenzie2012-01-132-5/+6
| | | | | |
| * | | | | international/mule-cmds.el (prefer-coding-system): Show a warning message if ↵Kenichi Handa2012-01-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | the default value of file-name-coding-system was not changed.
* | | | | | added stuff for loggingJoakim Verona2012-01-231-19/+28
| | | | | |
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ upstreamJoakim Verona2012-01-1717-123/+380
|\ \ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | * lisp/minibuffer.el (completion--replace): Strip properties.Stefan Monnier2012-01-162-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: debbugs:10062
| | * | | | | Provide persistent window parameters.Martin Rudalics2012-01-162-23/+50
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (Vwindow_persistent_parameters): New variable. (Fset_window_configuration, save_window_save): Handle persistent window parameters. * window.el (window-state-ignored-parameters): Remove variable. (window--state-get-1): Rename argument MARKERS to IGNORE. Handle persistent window parameters. Make copy of clone-of parameter only if requested. (Bug#10348) (window--state-put-2): Install a window parameter only if it has a non-nil value or an existing parameter shall be overwritten. * windows.texi (Window Configurations, Window Parameters): Describe persistent window parameters.
| | * | | | * net/tramp-sh.el (tramp-remote-path): Set tramp-autoload cookie.Michael Albinus2012-01-152-0/+5
| |/ / / /
| * | | | Allow visiting Info files with no "Up" pointer, such as DIR files.Eli Zaretskii2012-01-142-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | lisp/info.el (Info-toc-build): If the Info file has no "Up" pointer, don't pass the (nil) value of `upnode' to string-match.
| * | | | * startup.el (command-line): Fix values recognized by cursorBlink resource.Chong Yidong2012-01-152-1/+2
| | | | |
| * | | | * startup.el (command-line): Fix X resource class for cursorColor.Chong Yidong2012-01-142-1/+5
| | | | |
| * | | | Fix race condition in epg.el compat code.Paul Eggert2012-01-142-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/epg.el (epg--make-temp-file): Avoid permission race condition when running on old Emacs versions. Fixes: debbugs:10403
| * | | | * lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.Glenn Morris2012-01-132-3/+12
| | | | |
| * | | | dired fix for `ls -b' quoting of spaces (bug#10469)Glenn Morris2012-01-132-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
| * | | | Fix EDE security flaw involving loading arbitrary Lisp from Project.ede.Eric M. Ludlam2012-01-134-52/+211
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/ede.el (ede-project-directories): New option. (ede-directory-safe-p): Check it. (ede-initialize-state-current-buffer, ede, ede-new) (ede-check-project-directory, ede-rescan-toplevel) (ede-load-project-file, ede-parent-project, ede-current-project): (ede-target-parent): Avoid loading in a project unless it is safe, since it may involve malicious code. This security flaw was pointed out by Hiroshi Oota. * lisp/ede/auto.el (ede-project-autoload): Add safe-p slot. (ede-project-class-files): Projects using Project.ede are unsafe. (ede-auto-load-project): New method. * lisp/ede/simple.el (ede-project-class-files): Mark as unsafe.