mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 20:50:52 -08:00
Code Issues Projects Releases Wiki Activity
95055 commits 243 branches 194 tags 713 MiB
Commit graph

18256 commits

Author SHA1 Message Date
Stefan Monnier
d8b0cdddb3 * lisp/image-mode.el (image-mode-map): Remap left-char and right-char. 2010-06-13 23:19:46 -04:00
Stefan Monnier
b263a4c43f * lisp/nxml/nxml-mode.el (nxml-indent-line): Standardize indent behavior. 
Fixes: debbugs:6412
 2010-06-13 21:43:11 -04:00
Chong Yidong
133a8d82ea Revert 2010-06-02 change to log-edit-font-lock-keywords (Bug#6343). 
* vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
change temporarily (Bug#6343).
 2010-06-12 13:14:43 -04:00
Chong Yidong
89877f5f3c Add all rgb.txt color names to x-colors. 
* facemenu.el (list-colors-print): Don't print extra names if it
will overflow the window width.

* term/common-win.el (x-colors): Add all the color names defined
in rgb.txt (Bug#6332).
 2010-06-12 13:12:15 -04:00
Eli Zaretskii
9d1f18b5d3 Fix bug #6396. 
files.el (make-directory): Doc fix.
 2010-06-12 14:17:12 +03:00
Michael Albinus
b81a0b5691 * net/tramp.el (tramp-remote-process-environment): Protect version 
string by apostroph.
(tramp-shell-prompt-pattern): Do not use a shy group in case of
XEmacs.
(tramp-file-name-for-operation): Add `call-process-region'.
(tramp-set-process-query-on-exit-flag): Fix wrong parentheses.

* net/tramp-compat.el (top): Do not autoload
`tramp-handle-file-remote-p'.  Load tramp-util.el and tramp-vc.el
only when `start-file-process' is not bound.
(tramp-advice-file-expand-wildcards): Do not use
`tramp-handle-file-remote-p'.
(tramp-compat-make-temp-file): Handle the case, that
`make-temp-file' has no third argument EXTENSION.
 2010-06-12 10:59:37 +02:00
Juanma Barranquero
5fee75d49a Fix Windows makefiles to adapt to lisp/vc reorganization. 
* lib-src/makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
  and vc/ediff-hook.elc.

* lisp/makefile.w32-in (WINS_BASIC): Include new directory vc.
 2010-06-11 23:26:13 +02:00
Juanma Barranquero
69f18acc8d * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. 2010-06-11 23:19:23 +02:00
Juri Linkov
9766adfbca * lisp/finder.el (finder-known-keywords): Add keyword "vc" 
for version control.

* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
 2010-06-11 22:09:57 +03:00
Juri Linkov
56b2854f30 Move version control related files to the "vc" subdirectory. 
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.
 2010-06-11 21:51:00 +03:00
Chong Yidong
6534e58a57 Fix for comint-password-prompt-regexp (Bug#6367). 
* lisp/comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change
(Bug#6367).

* comint-testsuite.el: New file.
 2010-06-11 10:39:54 -04:00
Stephen Eglen
84d9562f57 Bind `shell-resync-dirs' to M-RET in *shell* buffers. 2010-06-11 14:28:41 +01:00
Michael Albinus
3ef0a6a5fe * notifications.el: Move file from lisp/net, because it is 
supposed to talk locally to the user.
 2010-06-10 14:56:11 +02:00
Michael Albinus
fa4003dab3 * net/notifications.el (notifications-on-action-signal) 
(notifications-on-closed-signal): Pass notification id as first
argument to the callback functions. Add docstrings.
(notifications-notify): Fix docstring.
 2010-06-10 14:44:59 +02:00
Glenn Morris
46e6650e09 Minor authors.el update. 
* lisp/emacs-lisp/authors.el (authors-ignored-files)
(authors-valid-file-names): Add some files.
 2010-06-09 22:39:03 -07:00
Glenn Morris
8826afe32d Fix ChangeLog attribution. 
This is on the assumption that the change from

http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00196.html

is actually based on the change from

http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00606.html
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2404

The fact that this wasn't pointed out at the time explains the recent
confusion with the latest emacs23 -> trunk merge.
 2010-06-09 22:17:21 -07:00
Stefan Monnier
a71832f78d * lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve 
merge conflict, giving preference to the emacs-23 version of the code.
 2010-06-09 21:10:04 -04:00
Juanma Barranquero
fff84c22e7 Remove duplicate ChangeLog entries. 2010-06-10 03:04:45 +02:00
Andreas Schwab
3c093c775f Conflict resolution fixup 2010-06-10 00:34:08 +02:00
Andreas Schwab
639b2760f1 Merge from emacs-23 2010-06-10 00:08:50 +02:00
Michael Albinus
890a18d631 * net/notifications.el (notifications-notify): Fix docstring. 2010-06-09 19:54:28 +02:00
Juanma Barranquero
bf3e70ebc1 Update to Unicode 6.0.0 beta. 
* lisp/international/charprop.el: Update copyright.
* lisp/international/mule-cmds.el (ucs-names): Update character ranges.
* lisp/international/uni-bidi.el:
* lisp/international/uni-category.el:
* lisp/international/uni-combining.el:
* lisp/international/uni-comment.el:
* lisp/international/uni-decimal.el:
* lisp/international/uni-decomposition.el:
* lisp/international/uni-digit.el:
* lisp/international/uni-lowercase.el:
* lisp/international/uni-mirrored.el:
* lisp/international/uni-name.el:
* lisp/international/uni-numeric.el:
* lisp/international/uni-old-name.el:
* lisp/international/uni-titlecase.el:
* lisp/international/uni-uppercase.el: Regenerate.
* admin/unidata/UnicodeData.txt: Update from
  http://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d5.txt
 2010-06-09 17:46:41 +02:00
Juanma Barranquero
ee8359ba5a * emacs-lisp/smie.el (comment-string-strip): Declare function. 
(smie-precs-precedence-table): Fix typo in docstring.
 2010-06-09 13:40:50 +02:00
Juanma Barranquero
f64ab8fb4c * vc-mtn.el (log-edit-extract-headers): Declare function. 2010-06-09 13:27:56 +02:00
Juanma Barranquero
883ffa8ce9 * vc-hg.el (log-edit-extract-headers): Remove duplicate declaration. 2010-06-09 13:24:34 +02:00
Juanma Barranquero
b978141d8b * net/notifications.el (dbus-register-signal): Declare function. 
(notifications-notify): Fix typos and reflow docstring.
 2010-06-09 13:16:21 +02:00
Dan Nicolaescu
5f4f2ae4f9 Improve VC create/retrieve tag/branch. 
* lisp/vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity.  Adjust the tag/branch
prompt.  Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity.  Reset VC properties.
 2010-06-09 00:47:14 -07:00
Michael Albinus
ef33fd3404 move notifications.el to net/ 2010-06-09 09:36:45 +02:00
Michael Albinus
41a863541c * notifications.el: New file. 2010-06-09 09:17:23 +02:00
Dan Nicolaescu
00fd1147bf Add optional support for resetting VC properties. 
* lisp/vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.
 2010-06-08 23:48:29 -07:00
Dan Nicolaescu
fab43c76d0 Improve support for special markup in the VC commit message. 
* lisp/vc-mtn.el (vc-mtn-checkin): Add support for Author: and Date: markup.
* lisp/vc-hg.el (vc-hg-checkin): Add support for Date:.
* lisp/vc-git.el (vc-git-checkin):
* lisp/vc-bzr.el (vc-bzr-checkin): Likewise.
 2010-06-08 22:24:01 -07:00
Stefan Monnier
e7d67e73b2 * lisp/emacs-lisp/smie.el (smie-indent-keyword): Remove special case that 
can be handled with a ((:before "fn") (:prev "=>" parent)) rule.
 2010-06-08 22:58:26 -04:00
Stefan Monnier
989bc97f04 * lisp/emacs-lisp/advice.el (ad-compile-function): 
Define warning-suppress-types before we let-bind it.

Fixes: debbugs:6275
 2010-06-08 21:18:31 -04:00
Stefan Monnier
8c6eab5a27 * lisp/vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook; 
declare it, make it buffer-local, and permanent-local.
(vc-resynch-window): Adjust name.
* lisp/vc-hooks.el (vc-find-file-hook): Adjust name.

Fixes: debbugs:6324
 2010-06-08 21:12:53 -04:00
Jonathan Rockway
2d9a4946e7 * lisp/net/rcirc.el: Add support for password authentication. 
(rcirc-server-alist): Add :password keyword.
(rcirc): Ask for a password, or get it from the server's alist.
(rcirc-connect): Add password argument.  Pass it to server.
 2010-06-07 17:20:44 -04:00
Martin Pohlack
277e674181 * lisp/iimage.el: Remove images as soon as the underlying text is modified. 
(iimage-modification-hook): New function.
(iimage-mode-buffer): Use it.
 2010-06-07 17:01:23 -04:00
Stefan Monnier
83156c183f * lisp/emacs-lisp/smie.el (smie-indent-offset-rule): Rename from 
smie-indent-offset-after.  Add :prev case.  Make a bit more generic.
(smie-indent-virtual): Remove `virtual' arg.  Update callers.
(smie-indent-keyword): Add handling of open-paren keywords.
(smie-indent-comment-continue): Don't assume comment-continue.
 2010-06-07 15:37:50 -04:00
Martin Rudalics
13b5221f4d * window.el (pop-to-buffer): Remove the conditional that 
compares new-window and old-window, so it will reselect
the selected window unconditionally.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html

* window.c (Fselect_window): Move `record_buffer' up to the
beginning of this function, so the buffer gets recorded
even if the selected window does not change.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html
 2010-06-07 21:28:02 +03:00
Stefan Monnier
c2ea581076 Make (after keyword) indent-rules more flexible. 
* lisp/emacs-lisp/smie.el (smie-indent-offset-after)
(smie-indent-forward-token, smie-indent-backward-token): New functions.
(smie-indent-after-keyword): Use them.
(smie-indent-fixindent): Only applies to the indentation of the BOL.
(smie-indent-keyword): Tweak the black magic.
(smie-indent-comment-continue): Strip comment-continue before use.
(smie-indent-functions): Indent comments before keywords.
 2010-06-06 22:10:19 -04:00
Juri Linkov
27dd3c1158 * lisp/isearch.el (isearch-lazy-highlight-search): Fix looping 
by checking for empty match.  This syncs this loop with the
similar loop in `isearch-search'.  (Bug#6362)
 2010-06-06 12:52:13 +03:00
Juanma Barranquero
35b148ee23 * net/dbus.el: Fix typos and declare function. 2010-06-05 22:36:27 +02:00
Dan Nicolaescu
eccdfe5fd1 vc-log-incoming/vc-log-outgoing fixes for Git. 
* lisp/vc-git.el (vc-git-log-view-mode): Fix font lock for
incoming/outgoing logs.
(vc-git-log-outgoing, vc-git-log-incoming): Use @{upstream}
instead of vc-git-compute-remote.
(vc-git-compute-remote): Remove.
 2010-06-05 02:56:22 -07:00
Juri Linkov
0665f66133 * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates. 
Instead of setting `replace' to t and replacing the same string
with itself, don't do certain actions when
kill-do-not-save-duplicates is non-nil and string is equal to car
of kill-ring: don't call menu-bar-update-yank-menu, don't push
interprogram-paste strings to kill-ring, and don't push the input
argument `string' to kill-ring.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00072.html
 2010-06-04 21:38:11 +03:00
Chong Yidong
86253dc05d * term/common-win.el (x-colors): Add "dark green" and "dark turquoise" (Bug#6332). 2010-06-04 12:15:51 -04:00
Juanma Barranquero
087fc47ace Turn `directory-sep-char' into a noop. 
* lisp/subr.el (directory-sep-char): Move from fileio.c and make a defconst.

* src/emacs.c (decode_env_path): Don't check DIRECTORY_SEP,
  call dostounix_filename directly.

* src/fileio.c (CORRECT_DIR_SEPS): Remove.
  (Ffile_name_directory, directory_file_name, Fexpand_file_name)
  (Fsubstitute_in_file_name): Use dostounix_filename instead.
  (file_name_as_directory): Use dostounix_filename, DIRECTORY_SEP.
  (syms_of_fileio) <directory-sep-char>: Move to subr.el.

* src/lisp.h [WINDOWSNT] (Vdirectory_sep_char): Don't declare.
  (DIRECTORY_SEP): Define unconditionally.

* src/w32proc.c (CORRECT_DIR_SEPS): Remove.
  (Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename.

* src/s/ms-w32.h (DIRECTORY_SEP): Remove.
 2010-06-04 16:13:35 +02:00
Michael Albinus
4f201088d3 * net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): Expand "~/". 
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Handle default-location.

* net/tramp-smb.el (tramp-smb-handle-delete-directory): Don't try to
move files to trash.
 2010-06-04 13:26:54 +02:00
Juanma Barranquero
18ccd78a19 mule-cmds.el: Add obsolescence information for nonascii-* vars. 
* international/mule-cmds.el (nonascii-insert-offset)
  (nonascii-translation-table): Add obsolescence information.

* international/mule.el (make-translation-table-from-vector): Doc fix.
 2010-06-04 03:38:12 +02:00
Dan Nicolaescu
6941ffecb2 vc-log-incoming/vc-log-outgoing improvements for Git. 
* lisp/vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise.  Run "git fetch" before the log command.
 2010-06-03 16:26:39 -07:00
Dan Nicolaescu
54d3626e26 Add bindings for vc-log-incoming and vc-log-outgoing. 
* lisp/vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* lisp/vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.
 2010-06-03 16:08:26 -07:00
Chong Yidong
aa1bc616a5 * net/rcirc.el (rcirc-sort-nicknames): Remove. 
(rcirc-handler-366): Always sort nicknames.
 2010-06-03 13:22:27 -04:00