aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* upstreamJoakim Verona2012-01-2368-2235/+2924
|\
| * Replace vc-dired references in comments with vc-dir.Glenn Morris2012-01-232-12/+9
| |
| * * pcl-cvs.texi (About PCL-CVS): Refer to vc-dir rather than vc-dired.Glenn Morris2012-01-232-6/+8
| |
| * * 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
| * Fix last change.Chong Yidong2012-01-231-1/+1
| |
| * * doc/emacs/anti.texi (Antinews): Add Emacs 24 antinews.Chong Yidong2012-01-233-6/+103
| |
| * Update several Lisp manual chapters.Chong Yidong2012-01-239-269/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/eval.texi (Intro Eval, Symbol Forms): Minor tweaks for correctness with lexical scoping. (Eval): Copyedits. * doc/lispref/sequences.texi (Sequence Functions): Don't repeat the introduction already given in the parent. (Vectors): Copyedits. (Rings): Move from lists.texi. Note that this is specific to the ring package. * doc/lispref/lists.texi (Cons Cells): Copyedits. (List Elements): Mention push. (List Variables): Mention pop. (Rings): Move to sequences.texi. * doc/lispref/strings.texi (Text Comparison): Minor qualification. * doc/lispref/symbols.texi (Definitions, Symbol Components): Mention variable scoping issues. (Plists and Alists): Copyedits.
| * 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
| |
| * Emacs Lisp manual updates.Chong Yidong2012-01-225-170/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/intro.texi (A Sample Function Description): Special notation used for macros too. * doc/lispref/objects.texi (Ctl-Char Syntax, Other Char Bits): Copyedits. (Symbol Type): Add xref for keyword symbols. (Sequence Type): Clarify differences between sequence types. (Cons Cell Type): Add "linked list" index entry. (Non-ASCII in Strings): Copyedits. (Equality Predicates): Symbols with same name need not be eq. * doc/lispref/numbers.texi (Float Basics): Document isnan, copysign, frexp and ldexp. Move float-e and float-pi to Math Functions node.
| * * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",Michael Albinus2012-01-212-3/+8
| | | | | | | | "plink1" and "psftp". (Bug#10530)
| * Make second arg of copysign non-optional.Chong Yidong2012-01-212-1/+6
| | | | | | | | | | * src/floatfns.c (Fcopysign): Make the second argument non-optional, since nil is not allowed anyway.
| * Update TUTORIAL.bg.Ognyan Kulev2012-01-215-358/+365
| |
| * merge trunkKenichi Handa2012-01-212131-11509/+24537
| |\
| | * * process.c (read_process_output): Use p instead of XPROCESS (proc).Andreas Schwab2012-01-212-6/+9
| | | | | | | | | | | | (send_process): Likewise.
| | * Fix windmove-reference-loc miscalculation.Jérémy Compostella2012-01-212-9/+14
| | |
| | * Document inhibit-local-variables-regexps in the lispref.Glenn Morris2012-01-204-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/modes.texi (Auto Major Mode): * doc/lispref/variables.texi (File Local Variables): Mention inhibit-local-variables-regexps. * etc/NEWS: Markup.
| | * 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-205-124/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * * etc/NEWS: Relocate MS Windows change to "non-free" section.Glenn Morris2012-01-201-4/+4
| | |
| | * * tramp.texi (File): Tweak wording for the `scpc' option.Eric Hanchrow2012-01-202-3/+16
| | |
| | * 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.
| | * doc/lispref/emacs-lisp-intro.texi (count-words-in-defun): Fix bug#10544.Juanma Barranquero2012-01-192-1/+6
| | |
| | * Fix handling of persistent window parameters.Martin Rudalics2012-01-196-93/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-187-45/+54
| | |\
| | | * Copy copyright fix from 2010-06-26T12:01:31Z!eliz@gnu.org to one more file.Glenn Morris2012-01-181-1/+2
| | | |
| | | * Revert unintentional addition of 2012 to Ecma copyright years.Glenn Morris2012-01-183-3/+3
| | | | | | | | | | | | | | | | | | | | 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
| | | |
| | | * Fix init_buffer for USE_MMAP_FOR_BUFFERS case (backport from trunk)Yoshiaki Kasahara2012-01-182-1/+6
| | | | | | | | | | | | | | | | | | | | * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing change.
| | | * Reorganize Emacs 23.4 NEWS.Chong Yidong2012-01-181-12/+10
| | | |
| | | * Add entry for ede-project-directories to NEWS.Chong Yidong2012-01-151-0/+12
| | | |
| | | * * make-dist: Distribute the etc/grammars subdirectory.emacs-pretest-23.3.90Chong Yidong2012-01-152-1/+7
| | | |
| | | * Bump version to 23.3.90.Chong Yidong2012-01-1520-781/+799
| | | | | | | | | | | | | | | | Regenerate ldefs-boot.el and AUTHORS.
| | | * Fix wrong font metrics for mouse highlight (backport ↵YAMAMOTO Mitsuharu2012-01-152-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2011-12-15T02:12:08Z!handa@m17n.org from trunk) * src/xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992).
| | | * Some copyright header fixes for grammar files.Chong Yidong2012-01-153-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * Fix previous ChangeLog date fix (no need to merge to trunk)Glenn Morris2012-01-131-1/+1
| | | |
| | | * ChangeLog date fix (no need to merge to trunk)Glenn Morris2012-01-131-3/+3
| | | |
| | | * Take display-table into account on calculating character/string width ↵Kenichi Handa2012-01-132-37/+35
| | | | | | | | | | | | | | | | (#Bug#9496).
| | | * * src/s/gnu-linux.h: Use CRT_DIR.Sven Joachim2012-01-122-2/+6
| | | |
| | | * * configure.in: Add i386 to cpp_undefs (Bug#8497).Glenn Morris2012-01-129-38/+142
| | | |
| | | * Add 2012 to FSF copyright years for Emacs files (do not merge to trunk)Glenn Morris2012-01-102012-2038/+2039
| | | |
| | | * Update short copyright year to 2012 (do not merge to trunk)Glenn Morris2012-01-1031-28/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * Fix uninitialized variable in note_mouse_highlight (backport from trunk).Eli Zaretskii2012-01-092-4/+4
| | | | | | | | | | | | | | | | * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947)
| | | * Avoid crash on composition (backport from trunk).Johan Bockgård2012-01-092-0/+11
| | | | | | | | | | | | | | | | | | | | * xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).
| | | * Fix last commit.Chong Yidong2012-01-091-2/+2
| | | |