From: Martin Rudalics Date: Sat, 15 Jan 2011 09:00:16 +0000 (+0100) Subject: Merge from trunk. X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3397a9b45c2a0050495e7c0bca1c92e823eb2c58;p=emacs.git Merge from trunk. --- 3397a9b45c2a0050495e7c0bca1c92e823eb2c58 diff --cc doc/lispref/buffers.texi index 4427bce9b6f,64d10fa4a2d..2b33e9a9d49 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@@ -1,11 -1,10 +1,10 @@@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, - @c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - @c Free Software Foundation, Inc. + @c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/buffers -@node Buffers, Windows, Backups and Auto-Saving, Top +@node Buffers, Frames, Backups and Auto-Saving, Top @chapter Buffers @cindex buffer diff --cc doc/lispref/positions.texi index ba68f6c5569,0b5dcd44dd8..a094ba157b3 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@@ -1,10 -1,10 +1,10 @@@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, - @c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + @c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/positions -@node Positions, Markers, Frames, Top +@node Positions, Markers, Windows, Top @chapter Positions @cindex position (in buffer) diff --cc lisp/ChangeLog index 6590f793675,3c88bb33646..8d8beb2808a --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,25 -1,132 +1,154 @@@ +2011-01-14 Martin Rudalics + + * simple.el (compose-mail-other-frame): Fix typo introduced in + last change. + + * window.el (window-safely-shrinkable-p): Remove. + + * calendar/calendar.el (calendar-generate-window): Only fit a + vertically combined window to its buffer. + (calendar-basic-setup): Call pop-to-buffer, preferably making a + new window at the bottom of the frame. Remove the + split-height-threshold binding around call of + calendar-list-holidays, this must be handled separately. + + 2011-01-14 Stefan Monnier + + * hexl.el (hexl-mode-old-*): Remove. + (hexl-mode--old-var-vals): New var to replace them. + (hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs. + (hexl-mode, hexl-follow-line, hexl-activate-ruler): + Use them to set local vars (bug#7846). + (hexl-mode-exit): Use hexl-mode--old-var-vals to restore state. + (hexl-backward-short, hexl-backward-word, hexl-scroll-down) + (hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify. + + * vc/smerge-mode.el: Resolve comment conflicts more aggressively. + (smerge-resolve--normalize-re): New var. + (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. + (smerge-resolve): Use them. + * newcomment.el (comment-only-p): New function. + (comment-or-uncomment-region): Use it. + + 2011-01-14 Brent Goodrick (tiny change) + + * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev + table, get the value before switching to the output buffer. (Bug#7733) + + 2011-01-14 Stefan Monnier + + * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). + + 2011-01-14 Kim F. Storm + + * emulation/cua-base.el (cua--init-keymaps): + Remap exchange-point-and-mark in cua-global-keymap. + + 2011-01-14 Tassilo Horn + + * progmodes/sh-script.el (sh-other-keywords): Add ZSH's foreach + loop keyword. + + 2011-01-14 Stefan Monnier + + * emacs-lisp/easymenu.el: Add :enable (bug#7754), and obey :label. + Require CL. + (easy-menu-create-menu, easy-menu-convert-item-1): + Use :label rather than nil for labels. Use `case'. + Add :enable as alias for :active. + (easy-menu-binding): Obey :label. + +2011-01-13 Martin Rudalics + + * mail/sendmail.el (sendmail-user-agent-compose): Remove let + bindings around funcall of switch-function. + (mail-bury): Merge change from trunk with quit-restore-window. + + * electric.el (Electric-pop-up-window): Adapt to new buffer + display specifiers. + 2011-01-13 Stefan Monnier + + Use run-mode-hooks for major mode hooks (bug#513). + * textmodes/reftex-toc.el (reftex-toc-mode-map): + Rename from reftex-toc-map. + (reftex-toc-mode): Use define-derived-mode. + * textmodes/reftex-sel.el (reftex-select-shared-map): New map. + (reftex-select-label-mode-map, reftex-select-bib-mode-map): + Rename from reftex-select-(label|bib)-map. Move init into declaration. + (reftex-select-label-mode, reftex-select-bib-mode): + Use define-derived-mode. + * textmodes/reftex-index.el (reftex-index-phrases-mode-map) + (reftex-index-mode-map): Rename from reftex-index(-phrases)-map. + Move init into delcaration. + (reftex-index-mode, reftex-index-phrases-mode): + Use define-derived-mode. + * speedbar.el (speedbar-mode-syntax-table): Renaqme from + speedbar-syntax-table. Move init into declaration. + (speedbar-mode-map): Rename from speedbar-key-map. + Move init into declaration. + (speedbar-file-key-map): Move init into declaration. + (speedbar-mode): Use define-derived-mode. + * recentf.el (recentf-mode): Don't run hook (or message) redundantly. + * net/rcirc.el (rcirc-mode): Use run-mode-hooks. + * emacs-lisp/chart.el (chart-mode-map): Rename from chart-map. + (chart-face-list): Move initialization into declaration. + (chart-mode): Use define-derived-mode. + * calculator.el (calculator-mode-map): Move init into declaration. + (calculator-mode): Use define-derived-mode. + + * mail/mail-utils.el (mail-strip-quoted-names): Make the regexp code + work for nested comments. + + * progmodes/prolog.el: Use syntax-propertize. Further code cleanup. + (prolog-use-prolog-tokenizer-flag): Change default when + syntax-propertize can be used. + (prolog-syntax-propertize-function): New var. + (prolog-mode-variables): Move make-local-variable into `set'. + Don't make comment-column local since we don't set it. + Set comment-add (as it was in previous prolog.el). Use dolist. + Set syntax-propertize-function. + (prolog-mode, prolog-inferior-mode): + Call prolog(-inferior)-menu directly, not through the mode-hook. + (prolog-buffer-module, prolog-indent-level) + (prolog-paren-is-the-first-on-line-p, prolog-paren-balance) + (prolog-comment-limits, prolog-goto-comment-column): + Use line-(end|beginning)-position. + (prolog-build-prolog-command): Tighten up regexp. + (prolog-consult-compile): Move make-local-variable into `set'. + (prolog-consult-compile-filter, prolog-goto-next-paren) + (prolog-help-on-predicate, prolog-clause-info) + (prolog-mark-predicate): Don't let+setq. + (prolog-indent-line): Use indent-line-to. + Only call prolog-goto-comment-column if necessary. + (prolog-indent-level): Use bobp. + (prolog-first-pos-on-line): Remove, not used any more. + (prolog-in-string-or-comment): Use syntax-ppss if available. + (prolog-help-on-predicate): Use read-string. + (prolog-goto-predicate-info): Simplify. + (prolog-read-predicate): Use `default' rather than `initial'. + (prolog-temporary-file): Use make-temp-file to close a security hole. + (prolog-toggle-sicstus-sd): New command. + (prolog-electric-underscore, prolog-variables-to-anonymous): + Use dynamic-scoping as it was meant. + (prolog-menu): Move menu definitions to top-level. + Use a toggle-button for Sicstus's source debugger. + Change "Code" to the more usual "Prolog", and hence change "Prolog" + to "System". + (prolog-inferior-menu): Reuse prolog-menu's help menu. + Move other menu definition to top-level. + + 2011-01-13 Tassilo Horn + + * doc-view.el (doc-view-open-text): Use meaningful text buffer + name. Keep original document's directory as default-directory + (bug#6446). + (doc-view-initiate-display): Fall back to normal mode when + doc-view-mode cannot be enabled, also when extracting the document + text into a separate buffer (bug#6446). + + * simple.el (shell-command): Don't error out if shell command + buffer contains text with non-nil read-only property when erasing + the buffer. 2011-01-13 Kim F. Storm diff --cc lisp/erc/ChangeLog index 34f7bd58ce7,26e8c9aee28..bde597590e3 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@@ -1,8 -1,8 +1,13 @@@ +2010-11-19 Martin Rudalics + + * erc-speedbar.el (erc-speedbar-goto-buffer): Use + pop-to-buffer-other-frame. + + 2011-01-13 Stefan Monnier + + * erc.el (erc-mode): + * erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode. + 2010-11-11 Glenn Morris * erc-lang.el (erc-cmd-LANG): Fix what may have been a typo.