Glenn Morris
cb4bfcb5da
* src/m/ibms390x.h: Rather than duplicating ibms390.h, just include it.
2010-06-09 22:23:00 -07:00
Glenn Morris
50b79479fc
Minor update for Acknowledgments in manual.
...
* doc/emacs/ack.texi (Acknowledgments):
* doc/emacs/emacs.texi (Acknowledgments): Update for notifications.el.
2010-06-09 22:20:14 -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
Katsumi Yamaoka
3d6e7a438c
Synch with Gnus trunk.
...
2010-06-10 Dan Christensen <jdc@uwo.ca>
* gnus-util.el (gnus-user-date): Use gnus-date-get-time.
(gnus-dd-mmm): Use gnus-date-get-time.
* gnus-sum.el (gnus-thread-latest-date): Use gnus-date-get-time and
simplify logic.
(gnus-summary-limit-to-age): Use gnus-date-get-time.
(gnus-sort-threads): emit message if gnus-sort-threads-loop used.
2010-06-10 00:30:13 +00: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
Dan Nicolaescu
c1b1acc2f7
* src/s/usg5-4.h: Fix previous change.
...
Suggested by Lawrence Mitchell <wence@gmx.li>
2010-06-09 11:36:58 -07: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
Stefan Monnier
e454a4a330
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
...
Check `object's type before accessing its guts.
2010-06-09 10:31:12 -04: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
f9e78150ee
* NEWS: Add notifications.el.
2010-06-09 09:26:38 +02:00
Michael Albinus
41a863541c
* notifications.el: New file.
2010-06-09 09:17:23 +02:00
Glenn Morris
3a61723751
* admin/notes/bugtracker: Note on some emacs-bug-tracker minutiae.
2010-06-08 23:53:17 -07: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
Andreas Schwab
373bf2b76c
* minibuf.c (Fall_completions): Add more checks.
2010-06-08 21:42:10 +02:00
Andreas Schwab
657d4c0be3
* minibuf.c (Fall_completions): Add more checks.
2010-06-08 19:56:21 +02:00
Juanma Barranquero
9b27fd9f75
* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
2010-06-08 18:53:11 +02:00
Michael Albinus
0e4966fb65
* auth-source.el (top): Autoload `secrets-list-collections',
...
`secrets-create-item', `secrets-delete-item'.
(auth-sources): Fix tag string.
(auth-get-source, auth-source-retrieve, auth-source-create)
(auth-source-delete): New defuns.
(auth-source-pick): Rewrite in order to avoid 2 passes.
(auth-source-forget-user-or-password): New parameter USERNAME.
(auth-source-user-or-password): New parameters CREATE-MISSING and
DELETE-EXISTING. Retrieve password interactively, if needed.
2010-06-08 15:05:11 +02:00
Dan Nicolaescu
d7c5d87df6
* src/lread.c (X_OK): Remove, unused.
2010-06-07 20:12:21 -07:00
Dan Nicolaescu
0263a94123
* src/dispnew.c: Remove obsolete comment.
2010-06-07 20:06:47 -07:00
Dan Nicolaescu
a99ebb40a7
Remove INCLUDED_FCNTL.
...
* xterm.c (INCLUDED_FCNTL):
* callproc.c (INCLUDED_FCNTL):
* alloc.c (INCLUDED_FCNTL):
* systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
(emacs_get_tty, emacs_set_tty): Declare unconditionally.
2010-06-07 20:02:41 -07:00
Dan Nicolaescu
78a7a06840
Include <strings.h> and <string.h> instead of
...
"strings.h" and "string.h".
2010-06-07 19:29:12 -07:00
Katsumi Yamaoka
5e7d4a75cb
Synch with Gnus trunk.
...
2010-06-07 Teodor Zlatanov <tzz@lifelogs.com>
* gnus.texi (Interactive): Explain effect of gnus-expert-user better.
2010-06-07 Teemu Likonen <tlikonen@iki.fi> (tiny change)
* gnus-agent.el (gnus-agent-expire-unagentized-dirs): Don't ask about
deleting unused directories when gnus-expert-user is t.
2010-06-07 23:00:42 +00: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
Juanma Barranquero
5220357f58
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
...
(Fforward_line, Fbeginning_of_line): Reflow docstrings.
2010-06-07 12:35:57 +02: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
Dan Nicolaescu
3085237cdc
Remove BSTRING related code, all platforms define it.
...
* src/s/usg5-4.h (BSTRING): Remove definition.
* src/s/template.h (BSTRING):
* src/s/msdos.h (BSTRING):
* src/s/ms-w32.h (BSTRING):
* src/s/hpux10-20.h (BSTRING):
* src/s/gnu-linux.h (BSTRING):
* src/s/darwin.h (BSTRING):
* src/s/cygwin.h (BSTRING):
* src/s/bsd-common.h (BSTRING):
* src/s/aix4-2.h (BSTRING): Likewise.
* src/sysdep.c: Remove code depending on BSTRING not being defined.
* configure.in: Remove code dealing with BSTRING.
* lib-src/ntlib.h: Remove code dealing with BSTRING.
* nt/config.nt: Remove code depending on BSTRING.
2010-06-06 01:57:39 -07: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
Juanma Barranquero
409f291913
Remove obsolete macro BASE_LEADING_CODE_P.
...
* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.
2010-06-05 02:41:32 +02: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