Jan Djärv
ea2b370da2
Merge from trunk
2010-01-06 17:04:19 +01:00
Jan Djärv
4270727858
Fixing user-spec for fonts instead of using name.
2010-01-06 17:03:26 +01:00
Dan Nicolaescu
7534fa5ed2
(vc-bzr-after-dir-status): Ignore pending merges.
2010-01-06 07:11:52 -08:00
Katsumi Yamaoka
8a9082249c
Merge from mainline.
2010-01-06 09:16:36 +00:00
Katsumi Yamaoka
770d9a1f45
Merge from mainline.
2010-01-06 00:00:28 +00:00
Chong Yidong
fd579fdca5
* progmodes/python.el (python-font-lock-keywords): Handle qualified decorators
...
(Bug#881).
2010-01-05 15:11:04 -07:00
Dan Nicolaescu
37860cafd5
(vc-bzr-working-revision): Fix looking for a revision
...
in a lightweight checkout.
2010-01-05 13:19:34 -08:00
Andreas Schwab
7b47345b7c
Fix gnus-summary-recenter to properly handle invisible lines
...
* gnus-sum.el (gnus-forward-line-ignore-invisible): New function.
(gnus-summary-recenter): Use it instead of forward-line. (Bug#5257)
2010-01-05 21:37:43 +01:00
Kenichi Handa
69db641dfe
language/indian.el (malayalam-composable-pattern): Fix ZWNJ and ZWJ.
2010-01-05 20:59:03 +09:00
Dan Nicolaescu
b25d6a02fd
(vc-bzr-diff): Obey vc-disable-async-diff.
2010-01-04 23:46:35 -08:00
Dan Nicolaescu
8e7e22861e
(vc-bzr-shelve-map): Change binding for vc-bzr-shelve-apply-at-point.
...
(vc-bzr-shelve-menu-map):
(vc-bzr-dir-extra-headers): Improve menu and tooltip text.
(vc-bzr-shelve-apply): Make prompt more explicit.
2010-01-03 22:40:30 -08:00
Dan Nicolaescu
3d5d0aa92f
(vc-bzr-log-view-mode): Also highlight the author.
2010-01-03 20:43:23 -08:00
Dan Nicolaescu
137d88ca4b
(vc-bzr-state-heuristic): Make it work for lightweight
...
checkouts. (Bug#618)
2010-01-03 20:35:21 -08:00
Chong Yidong
da76998b68
* net/browse-url.el (browse-url-encode-url): Don't escape commas.
...
They are valid characters in URL paths (rfc3986), and at least
Firefox does not understand the encoded version (Bug#3166).
2010-01-02 15:14:54 -05:00
Chong Yidong
b2ad70b67b
Allow use of "end" keyword for terminating Octave-mode blocks.
...
* progmodes/octave-mod.el (octave-end-keywords)
(octave-block-begin-or-end-regexp, octave-block-match-alist): Add
"end" keyword (Bug#3061).
(octave-end-as-array-index-p): New function.
(calculate-octave-indent): Use it.
2010-01-02 14:40:59 -05:00
Chong Yidong
61f49e0bb6
Fix last change to message-exchange-point-and-mark.
...
* message.el (message-exchange-point-and-mark): Rework last change to
avoid using optional arg of exchange-point-and-mark, for backward
compatibility.
2010-01-02 14:18:44 -05:00
Karl Fogel
5413628238
* lisp/bookmark.el: Consistently put the text property on the bookmark name.
...
(bookmark-bmenu-marks-width): Bump back to 2, to include annotation marks.
(bookmark-bmenu-hide-filenames): Adjust for above, and put the text
property on the bookmark name, instead of not putting it at all.
(bookmark-bmenu-list): Fix where we put the text property.
2010-01-02 14:14:13 -05:00
Karl Fogel
74255a512c
* lisp/bookmark.el: Ahh, remove silly debugging cruft, sorry for the noise.
2010-01-02 14:03:25 -05:00
Karl Fogel
cc4d3cad09
* lisp/bookmark.el (bookmark-bmenu-save): Just depend on the new logic
...
for showing buffer modified state (as added in the previous change).
2010-01-02 13:57:02 -05:00
Karl Fogel
b894c43953
* lisp/bookmark.el: Show modified state of bookmark buffer more accurately.
...
(bookmark-bmenu-list): Initialize buffer-modified-p properly.
(bookmark-send-edited-annotation): Mark bookmark-alist as modified.
(with-buffer-modified-unmodified): New macro.
(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames,
bookmark-bmenu-mark, bookmark-bmenu-unmark, bookmark-bmenu-delete):
Use new macro to preserve the buffer-modified state.
2010-01-02 13:52:32 -05:00
Karl Fogel
3a69db535c
* lisp/bookmark.el (bookmark-bmenu-select, bookmark-bmenu-1-window,
...
(bookmark-bmenu-2-window, bookmark-bmenu-this-window)
(bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window)
(bookmark-bmenu-show-annotation, bookmark-bmenu-edit-annotation)
(bookmark-bmenu-rename, bookmark-bmenu-locate)
(bookmark-bmenu-relocate, bookmark-bmenu-goto-bookmark): Remove
unnecessary calls to `bookmark-bmenu-ensure-position'.
2010-01-02 13:13:28 -05:00
Eli Zaretskii
af414f10d8
emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Make
...
the lines in the generated doc string shorter. (Bug#4668)
2010-01-02 19:33:54 +02:00
Chong Yidong
f2ec0e5e49
* lisp/net/rcirc.el: Add follow-link binding (Bug#4738).
2010-01-02 11:13:22 -05:00
Eli Zaretskii
38c1ba62af
Rename cvs-update to bzr-update in lisp/ Makefiles.
...
Makefile.in (bzr-update): Renamed from cvs-update.
(cvs-update): New target for backward compatibility.
makefile.w32-in (bzr-update): Renamed from cvs-update.
(cvs-update): New target for backward compatibility.
2010-01-02 12:42:11 +02:00
Karl Fogel
ea2c0f5b94
* lisp/bookmark.el: Remove gratuitous gratitude.
2010-01-02 03:09:17 -05:00
Karl Fogel
479899451b
* lisp/bookmark.el (bookmark-bmenu-any-marks): New function
...
(bookmark-bmenu-save): Clear buffer modification if no marks.
2010-01-02 02:08:02 -05:00
Karl Fogel
5ae329f4c8
* lisp/bookmark.el (bookmark-bmenu-marks-width): Define to 1, not 2.
...
(bookmark-bmenu-list, bookmark-bmenu-bookmark): Calculate property
positions by using `bookmark-bmenu-marks-width', instead of hardcoding.
This fixes the `bookmark-bmenu-execute-deletions' bug reported here:
http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00819.html
From: Sun Yijiang <sunyijiang {_AT_} gmail.com>
To: emacs-devel {_AT_} gnu.org
Subject: bookmark.el bug report
Date: Mon, 28 Dec 2009 14:19:16 +0800
Message-ID: 5065e2900912272219y3734fc9fsdaee41167ef99ad7@mail.gmail.com
2010-01-02 00:00:55 -05:00
Karl Fogel
aef053eb79
* lisp/bookmark.el: Improvements suggested by Drew Adams:
...
(bookmark-bmenu-ensure-position): New name for
`bookmark-bmenu-check-position'. Just ensure the position;
don't return any meaningful value.
(bookmark-bmenu-header-height, bookmark-bmenu-marks-width): New constants.
2010-01-01 23:36:17 -05:00
Juanma Barranquero
d8c75479e9
lisp/ChangeLog: Fix typos.
2010-01-02 02:06:31 +01:00
Juanma Barranquero
0472835ff2
lisp/*: Fix typos in docstrings and messages.
2010-01-02 02:05:44 +01:00
Juanma Barranquero
db4a7382f0
lisp/org/org.el: Fix typos in error messages.
2010-01-02 02:03:48 +01:00
Chong Yidong
bd0948ca04
* lisp/gnus/message.el (message-exchange-point-and-mark): Call
...
exchange-point-and-mark with an argument rather than setting
mark-active by hand (Bug#5175).
2010-01-01 15:42:22 -05:00
Chong Yidong
9bbe0828a0
* lisp/files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149).
2010-01-01 15:03:37 -05:00
Chong Yidong
918fa8ba98
* lisp/ChangeLog: Update bug number in last change.
2010-01-01 13:44:02 -05:00
Chong Yidong
a88c46c3a8
* comint.el (comint-input-ring-size): Make it a defcustom and
...
increase the default to 500.
2010-01-01 13:43:25 -05:00
Chong Yidong
829f35a5bb
Bump version to 23.1.91. Regenerate AUTHORS and ldefs-boot.el.
2009-12-30 21:14:46 -05:00
Nick Roberts
7ee6c59b15
Further changes from EMACS_23_1_RC branch (2009-12-29 contd).
...
* term/x-win.el (x-gtk-stock-map): Map some GUD buttons.
* progmodes/gud.el (gud-menu-map): Add reverse-execution commands.
2009-12-31 02:19:53 +13:00
Nick Roberts
ac4a952936
(vc-hg-working-revision): Tweak previous change.
2009-12-30 19:53:47 +13:00
Nick Roberts
a9c8a2cdf8
Show working revision correctly for mercurial.
...
* vc-hg.el (vc-hg-working-revision): Use hg parent instead of
hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>,
2009-12-30 15:22:45 +13:00
Juanma Barranquero
3570691b24
Fix typos in ChangeLogs.
2009-12-29 19:29:33 +01:00
Juanma Barranquero
659e4408a4
Declare some functions for the byte-compiler.
2009-12-29 18:44:27 +01:00
Nick Roberts
49f073bd8a
This changeset reverts GDB Graphical Interface to use annotations. It incorporates features added
...
(and never released) on the EMACS_23_1_RC branch. Namely reverse debugging and the display of STL
collections as watch expressions.
The long term aim is to move to GDB/MI, so these changes will be re-instated at some time in the future.
At the moment, however, there are issues with gdb-mi.el that have not yet
2009-12-29 20:15:34 +13:00
Dan Nicolaescu
460f6e7ced
Make vc-dir work on subdirectories of the bzr root.
...
* vc-bzr.el (vc-bzr-after-dir-status): Add new argument. Return
file names relative to it.
(vc-bzr-dir-status, vc-bzr-dir-status-files): Pass the bzr root
relative directory to vc-bzr-after-dir-status.
2009-12-28 22:46:08 -08:00
Juanma Barranquero
5ce6e4f452
Fix typos in ChangeLogs.
2009-12-29 02:57:40 +01:00
Tassilo Horn
543f553a8d
* font-lock.el (font-lock-refresh-defaults): New function, which
...
can be used to let font-lock react to external changes in
variables like font-lock-defaults and keywords.
See http://thread.gmane.org/gmane.emacs.devel/118777/focus=118802
2009-12-28 20:34:10 +01:00
Dan Nicolaescu
ac859983d7
* vc-rcs.el (vc-rcs-register): Fix registering a specific version.
2009-12-28 11:20:02 -08:00
Dan Nicolaescu
2592ab767a
(vc-bzr-log-view-mode): Fix short log regexp.
2009-12-28 10:34:51 -08:00
Kenichi Handa
e7936c0f9f
Add new entries to ChangeLog
2009-12-28 16:29:24 +09:00
Kenichi Handa
bcffff4634
*** empty log message ***
2009-12-28 15:09:58 +09:00
Juanma Barranquero
58941d03a5
Supersede color.diff settings in git log (bug#5211).
2009-12-28 03:43:28 +01:00