1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Commit graph

97991 commits

Author SHA1 Message Date
Glenn Morris
2153c86209 * admin/charsets/cp51932.awk: No longer print arch-tag. 2011-01-15 14:46:51 -08:00
Glenn Morris
623717b76c * admin/charsets/eucjp-ms.awk: No longer print arch-tag. 2011-01-15 14:44:52 -08:00
Glenn Morris
d0d4361dba Add 2011 to remaining FSF/AIST copyright years. 2011-01-15 14:10:37 -08:00
Glenn Morris
4ebf3ee11c * admin/notes/bzr: More on previous. 2011-01-15 13:51:36 -08:00
Glenn Morris
9aafb22b66 * admin/notes/bzr: Add an idiot's guide to merging between branches. 2011-01-15 13:47:46 -08:00
Glenn Morris
6fffc9003c bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
2011-01-15 12:42:23 -08:00
Glenn Morris
d52969e8af Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.
Note:
emacs-23 2010-05-20T01:32:08Z!lekktu@gmail.com is rendered unnecessary by pre-existing 2010-05-20
trunk change.
2011-01-15 12:38:27 -08:00
Glenn Morris
362b9d483c Merge from emacs-23 branch. 2011-01-15 12:03:38 -08:00
Chong Yidong
9f19b8ddfe Bump version to 23.2.92.
Regenerate AUTHORS, configure, and ldefs-boot.el.
2011-01-14 22:50:47 -05:00
Chong Yidong
dab7376027 * configure: Bump min libxml2 version to 2.6.17 (Bug#7603). 2011-01-14 22:21:48 -05:00
Chong Yidong
bb033b5f61 * building.texi (Compilation): Improve instructions for running two compilations (Bug#7573). 2011-01-14 22:10:38 -05:00
Martin Rudalics
6dc1d2d387 Avoid crash in Fselect_frame due to null selected_window (Bug#7728).
* window.c (inhibit_point_swap): New variable.
(Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
point this time.
(Fset_window_configuration): Set inhibit_point_swap to 1 instead
of setting selected_window to nil (Bug#7728).
2011-01-14 21:55:58 -05:00
Mark Diekhans
b024d9f02d Make last-resort backup file in .emacs.d (Bug#6953).
* lisp/files.el (backup-buffer): Make last-resort backup file in
.emacs.d.

* lisp/subr.el (locate-user-emacs-file): If .emacs.d does not exist,
make it with permission 700.

* doc/emacs/files.texi (Backup Names): Document the new location of the
last-resort backup file.
2011-01-14 21:32:19 -05:00
Katsumi Yamaoka
e60c6ca9ca [Gnus] Update copyright years. 2011-01-15 00:35:35 +00:00
Stefan Monnier
4391b429f8 * lisp/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.
(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.

Fixes: debbugs:7846
2011-01-14 14:55:35 -05:00
Paul Eggert
46d7106433 Merge: make-dist distributes test/ files too. 2011-01-14 10:58:35 -08:00
Paul Eggert
9f4b8b4732 * make-dist: Distribute test/ files too.
Distribute every file under test/ that is under version control,
using patterns like *.el to capture files that are added later.
Without this change, "configure" would fail, because it would
attempt to build from a Makefile.in that was not distributed.
2011-01-14 10:56:58 -08:00
Stefan Monnier
6d3d611343 * lisp/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.
* lisp/newcomment.el (comment-only-p): New function.
(comment-or-uncomment-region): Use it.
2011-01-14 13:10:15 -05:00
Stefan Monnier
f80aa5bfa9 Update md5 checksums 2011-01-14 13:06:07 -05:00
Glenn Morris
15a1cca8ec ChangeLog merge fixes. 2011-01-14 09:42:40 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Kim F. Storm
8faba62c38 * emulation/cua-base.el (cua--init-keymaps):
Remap exchange-point-and-mark in cua-global-keymap.
2011-01-14 16:06:17 +01:00
Tassilo Horn
ab7eb81180 * progmodes/sh-script.el (sh-other-keywords): Add ZSH's foreach
loop keyword.
2011-01-14 13:17:24 +01:00
Deniz Dogan
9cf56b2c82 * net/rcirc.el: Adding maintainer info and e-mail addresses. 2011-01-14 12:25:56 +01:00
Kenichi Handa
66399c0a66 merge emacs-23 2011-01-14 13:08:30 +09:00
Kenichi Handa
1a6a03e4a3 Fix setting of buffer-file-coding-system of RMAIL buffer. 2011-01-14 13:04:10 +09:00
Glenn Morris
1851cac3e3 * admin/bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
2011-01-13 18:44:25 -08:00
Stefan Monnier
fc55380c5c * lisp/emacs-lisp/easymenu.el: Add :enable, 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.

Fixes: debbugs:7754
2011-01-13 21:12:43 -05:00
Stefan Monnier
4d789d84b8 Use run-mode-hooks for major mode hooks.
* lisp/textmodes/reftex-toc.el (reftex-toc-mode-map):
Rename from reftex-toc-map.
(reftex-toc-mode): Use define-derived-mode.
* lisp/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.
* lisp/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.
* lisp/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.
* lisp/recentf.el (recentf-mode): Don't run hook (or message) redundantly.
* lisp/net/rcirc.el (rcirc-mode): Use run-mode-hooks.
* lisp/emacs-lisp/chart.el (chart-mode-map): Rename from chart-map.
(chart-face-list): Move initialization into declaration.
(chart-mode): Use define-derived-mode.
* lisp/calculator.el (calculator-mode-map): Move init into declaration.
(calculator-mode): Use define-derived-mode.
* lisp/cedet/srecode/srt-mode.el (srecode-template-mode):
Use define-derived-mode.
* lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):
Use run-mode-hooks.
* lisp/erc/erc.el (erc-mode):
* lisp/erc/erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode.
* lisp/org/org-remember.el (org-remember-mode):
* lisp/org/org-capture.el (org-capture-mode): Don't run hook redundantly.

Fixes: debbugs:513
2011-01-13 18:14:30 -05:00
Stefan Monnier
b49a2dbf58 * lisp/mail/mail-utils.el (mail-strip-quoted-names): Make the regexp code
work for nested comments.
2011-01-13 16:48:34 -05:00
Stefan Monnier
db5d03ea56 * test/indent/prolog.prolog: Add tokenizing tests. 2011-01-13 15:53:06 -05:00
Stefan Monnier
dbed16aa06 * lisp/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 15:46:38 -05:00
Tassilo Horn
1281bd51e8 (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).
2011-01-13 21:17:15 +01:00
Tassilo Horn
5b3553158d * doc-view.el (doc-view-open-text): Use meaningful text buffer
name.  Keep original document's directory as default-directory
(bug#6446).
2011-01-13 20:48:26 +01:00
Tassilo Horn
50f8cd9617 * 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 19:58:28 +01:00
Kim F. Storm
821f936d1c * ido.el (ido-may-cache-directory): Move "too-big" check later.
(ido-next-match, ido-prev-match): Fix stray reordering of matching
items when cycling through the matches.
2011-01-13 17:26:40 +01:00
Tassilo Horn
f754f89846 * dired-x.el (dired-omit-verbose): New defcustom that allows
disabling the omit messages.
(dired-omit-expunge): Use it.
2011-01-13 16:44:41 +01:00
Christian Ohler
8b845e3b89 Merged from trunk. 2011-01-13 19:08:58 +11:00
Chong Yidong
c88aaf48b2 * lisp/subr.el (event-start, event-end): Doc fix (Bug#7826). 2011-01-13 00:12:01 -05:00
Chong Yidong
a03b542a78 * font-lock.el (font-lock-verbose): Default to nil. 2011-01-12 23:30:23 -05:00
Chong Yidong
5399653b53 * message.el (message-bury): Add special-case handling for Rmail.
This should not be merged into the trunk.
2011-01-12 23:24:31 -05:00
Chong Yidong
25ca2e6140 New arg RETURN-ACTION for compose-mail, and related functions.
* lisp/mail/sendmail.el (mail-return-action): New var.
(mail-mode): Make it buffer-local.
(mail-bury): Obey it.  Move special Rmail window handling to
rmail-mail-return.
(mail, mail-setup): New arg RETURN-ACTION.
(sendmail-user-agent-compose): Move from simple.el.

* lisp/simple.el (sendmail-user-agent-compose): Move to sendmail.el.
(compose-mail): New arg RETURN-ACTION.
(compose-mail-other-window, compose-mail-other-frame): Likewise.

* lisp/gnus/gnus-msg.el (gnus-msg-mail): New arg RETURN-ACTION.  Pass it to
message-mail.

* lisp/gnus/message.el (message-mail): New arg RETURN-ACTION.
(message-return-action): New var.
(message-bury): Use it.
(message-mode): Make it buffer-local.
(message-send-and-exit): Always call message-bury.
(message-tool-bar-gnome): Tweak tool-bar items.  Add :vert-only tags.

* lisp/mail/rmail.el (rmail-mail-return): New function.
(rmail-start-mail): Pass it to compose-mail.

* lisp/mh-e/mh-comp.el (mh-user-agent-compose): New arg RETURN-ACTION.
2011-01-12 23:23:41 -05:00
Chong Yidong
b2948a8779 * cus-theme.el (customize-themes): Use switch-to-buffer.
* menu-bar.el (menu-bar-custom-menu): Tweak Mule and Customize
menus.  Add menu item for customize-themes.
2011-01-12 14:10:00 -05:00
Chong Yidong
2a8b13afb7 * emacs-lisp/package.el (package--list-packages): Use switch-to-buffer. 2011-01-12 13:57:23 -05:00
Christian Ohler
ea062854af configure: Regenerated. 2011-01-13 03:22:13 +11:00
Tassilo Horn
1b71db167e Better diff faces on dark background. 2011-01-12 17:19:36 +01:00
Christian Ohler
d221e7808c Add ERT, a tool for automated testing in Emacs Lisp.
* Makefile.in, configure.in, doc/misc/Makefile.in, doc/misc/makefile.w32-in:
Add ERT.  Make "make check" run tests in test/automated.

* doc/misc/ert.texi, lisp/emacs-lisp/ert.el, lisp/emacs-lisp/ert-x.el:
New files.

* test/automated: New directory.
2011-01-13 03:08:24 +11:00
Tassilo Horn
03d32f1b22 Minor docfixes in imagemagick_load_image. 2011-01-12 08:35:04 +01:00
Kenichi Handa
07ee935146 merge emacs-23 2011-01-12 15:11:40 +09:00
Kenichi Handa
e7ca0062a4 Another improvement of MIME handling in rmail. 2011-01-12 15:08:55 +09:00