1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Commit graph

98390 commits

Author SHA1 Message Date
Glenn Morris
4d881c8341 bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
2011-02-05 14:46:34 -08:00
Glenn Morris
233ba4d924 Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca. 2011-02-05 14:30:14 -08:00
Glenn Morris
a60287ff99 * lisp/emacs-lisp/cl-macs.el (return-from): Fix doc typo. 2011-02-05 14:03:44 -08:00
Deniz Dogan
827b77e90f * lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
(Bug#6386).
2011-02-05 22:07:26 +01:00
Stefan Monnier
ba70ab1cad * lisp/progmodes/sh-script.el (sh-here-doc-open-re): Don't rely on the
font-lock-syntax-table remappings.
(sh-here-doc-markers, sh-here-doc-re): Remove.
(sh-font-lock-close-heredoc): Remove.
(sh-syntax-propertize-here-doc): New function.
(sh-font-lock-open-heredoc): Set the sh-here-doc-marker property
instead of the sh-here-doc-re.
(sh-font-lock-paren): Don't do anything in comments or strings.
Handle line continuations.  Accept a few more chars.
Don't rely on the font-lock-syntax-table remappings.
`esac' is not a valid pattern.
(sh-syntax-propertize-function): Handle here-docs differently, so we
don't bother syntax-propertizing the insides.

Fixes: debbugs:7947
2011-02-05 14:46:47 -05:00
Stefan Monnier
7cb76591b0 * lisp/progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):
Handle new bashisms ";&" and ";;&".

Fixes: debbugs:7947
2011-02-05 10:53:04 -05:00
Katsumi Yamaoka
156ad271e5 overrides.texi: Remove.
sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.
2011-02-05 12:29:48 +00:00
Katsumi Yamaoka
48fb2ce10a Makefile.in (webhack, nowebhack): New targets that I forgot to merge from Gnus last. 2011-02-05 11:23:52 +00:00
Paul Eggert
1a8ae90761 Merge: xstrcasecmp: conform to C89 pointer rules 2011-02-05 02:22:19 -08:00
Paul Eggert
25a48bd06b xstrcasecmp: conform to C89 pointer rules 2011-02-05 02:20:15 -08:00
Michael Albinus
36539990ce * tramp.texi:
Replace "delimet" with "delimit" globally.
Replace "explicite" with "explicit" globally.
Replace "instead of" with "instead" where there was nothing after "of".
Audit use of comma before interrogative pronoun, "that", or "which".
Minor word order, spelling, wording changes.
(Frequently Asked Questions): Mention problems with WinSSHD.

* trampver.texi: Update release number.
2011-02-05 11:11:32 +01:00
Michael Albinus
39b20f56c0 * net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'. Add
"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
2011-02-05 11:03:29 +01:00
Paul Eggert
d154c079dd Merge: * charset.c: conform to C89 pointer rules 2011-02-05 02:00:31 -08:00
Michael Albinus
51aba3f351 * net/tramp.el (tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-domain-format)
(tramp-prefix-domain-regexp, tramp-postfix-user-format)
(tramp-postfix-user-regexp, tramp-prefix-port-format)
(tramp-prefix-port-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-handle-substitute-in-file-name):
Doc fix.
2011-02-05 10:58:45 +01:00
Paul Eggert
dfb6afda10 * charset.c: conform to C89 pointer rules
(define_charset_internal): Switch between char * and unsigned char *.
2011-02-05 01:57:53 -08:00
Michael Albinus
2c68ca0e31 Replace "explicite" with "explicit" globally
Replace "instead of" with "instead" where there was nothing after "of"
Audit use of comma before interrogative pronoun, "that", or "which"
2011-02-05 10:52:07 +01:00
Paul Eggert
cc618f4e69 * xmenu.c: conform to C89 const rules
(xmenu_show, xdialog_show): Declare local var as char *, not
const char *, to stay compatible with C89 const rules.
2011-02-05 01:49:52 -08:00
Paul Eggert
9bcaafce53 * xdisp.c: conform to C89 pointer rules
(store_mode_line_noprop, display_string, reseat_to_string):
(c_string_pos, number_of_chars, message_dolog):
(message_log_check_duplicate, set_message_1, store_mode_line_noprop):
(display_mode_element, display_string):
Switch between char * and unsigned char * to stay compatible wth
C89 pointer rules.
2011-02-05 01:26:46 -08:00
Paul Eggert
03fc768bf7 * emacsclient.c: conform to C89 pointer rules 2011-02-04 23:18:46 -08:00
Chong Yidong
a41c866068 Last remaining doc additions required by 23.3.
* doc/emacs/maintaining.texi (VC Change Log): Document vc-log-incoming and
vc-log-outgoing.
(Merging): Document vc-find-conflicted-file.

* doc/emacs/rmail.texi (Rmail Display): Document Rmail MIME support more
accurately.

* doc/lispref/commands.texi (Accessing Mouse): Note that a header line is not
included in the row of posn-col-row.

* etc/NEWS: Remove +++ and --- lines.
2011-02-05 01:13:36 -05:00
Paul Eggert
5b0534c888 * regex.c: conform to C89 pointer rules 2011-02-04 21:48:19 -08:00
Paul Eggert
d67985d3f9 sync from gnulib to remove HAVE_STDBOOL_H 2011-02-04 21:07:22 -08:00
Gnus developers
ec72bf63ae Merge changes made in Gnus trunk.
shr.el (shr-render-td): Store the actual background colour used.
gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.
auth-source.el: Rewrite.
gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
WEBHACKDEVEL work:
 Makefile.in (webhack, nowebhack): Hacks to produce for-the-web manuals.
 auth.texi: Use WEBHACKDEVEL.
 emacs-mime.texi: Use WEBHACKDEVEL.
 gnus.texi: Use WEBHACKDEVEL.
 message.texi: Use WEBHACKDEVEL.
 pgg.texi: Use WEBHACKDEVEL.
 sasl.texi: Use WEBHACKDEVEL.
 sieve.texi: Use WEBHACKDEVEL.
 overrides.texi: New file to set or clear WEBHACKDEVEL.
message.el (message-setup-1): Remove the read-only stuff, since it doesn't work under XEmacs, for some reason.
2011-02-05 00:11:16 +00:00
Eli Zaretskii
f90e08f57d Update dependencies in src/makefile.w32-in.
makefile.w32-in (LISP_H, PROCESS_H): New variables.
 Replace all uses of lisp.h with $(LISP_H), and all uses of
 process.h with $(PROCESS_H).
 ($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
 ($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
 ($(BLD)/sysdep.$(O)): Depend on ../lib/ignore-value.h.
2011-02-04 17:32:34 +02:00
Sam Steingold
7bc61bb7bf * lisp/mouse.el (mouse-buffer-menu-mode-groups): Add a "GDB" group. 2011-02-04 09:54:13 -05:00
Lars Ingebrigtsen
984ef96d31 Doc fix. 2011-02-04 12:26:36 +00:00
Eli Zaretskii
be50df37a3 deps.mk: Update for recent changes: gnutls, gnulib imports, globals.h. 2011-02-04 14:01:34 +02:00
Andreas Schwab
d93c111eaa * international/mule-util.el (with-coding-priority): Doc fix. 2011-02-04 11:45:46 +01:00
Lars Ingebrigtsen
2b7feab009 message.el (message-setup-1): Don't bind the constant -forbidden-properties.
(message-setup-1): Revert previous change, since it needs to bind the props to insert them.
 (message-resend): Allow removing the read-only separator line.
2011-02-04 09:51:56 +00:00
Eli Zaretskii
a5d733f5d7 Adapt to addition of ignore-value.h in 2011-02-03T19:29:35Z!eggert@cs.ucla.edu.
src/makefile.w32-in (IGNORE_VALUE_H): New variable.
 ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
 nt/config.nt (inline) [__GNUC__]: Define (for gnulib).
2011-02-04 11:17:36 +02:00
Eli Zaretskii
6f52d86e95 Fix bug #7977 with special-mode-map in arc-mode.el.
arc-mode.el (archive-mode-map): Fix a typo in last change.
2011-02-04 11:12:32 +02:00
Glenn Morris
e3a70a8a45 * lisp/obsolete/spell.el: Undo previous comment change. 2011-02-03 19:27:18 -08:00
Glenn Morris
9ad53e98fd diary-lib.el fix for bug#7891.
* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.
2011-02-03 19:23:55 -08:00
Glenn Morris
9783df21c0 f90.el fix for bug#7919.
* lisp/progmodes/f90.el (f90-find-tag-default): New function.
(f90-mode): Use it for mode's `find-tag-default-function' property.
2011-02-03 19:21:11 -08:00
Glenn Morris
d436de979a * doc/emacs/custom.texi (Variables): Fix typo. 2011-02-03 19:17:58 -08:00
Gnus developers
0d1c2cc8c8 Merge changes made in Gnus trunk.
gnus-util.el: change default value of gnus-user-date-format-alist.
gnus-art.el (gnus-article-jump-to-part): Remove useless sit-for.
gnus-art.el: remove old FIXME.
gnus.el (gnus-summary-line-format): Add missing semi-colon for user-date in docstring.
message.el (message-setup-1): Always generate References first.
 (message-mail): Return the return value of message-setup, not always t.
gnus-start.el (gnus-read-active-for-groups): This function is never called with a nil `infos', so clean that up.
 (gnus-get-unread-articles): Request active files from primary/secondary methods that have no groups (yet).
 (message-setup-1): Insert mail-header-separator with read-only and intangible properties set.
gnus-draft.el: Remove progn around gnus-draft-setup.
gnus-start.el (gnus-get-unread-articles): Fix the call to methods that have no groups.
nnimap.el (nnimap-request-accept-article): Give an error message if the APPEND wasn't successful.
2011-02-03 23:43:22 +00:00
Paul Eggert
5dc7a1d2c4 * lib/ignore-value.h: New file. 2011-02-03 13:38:34 -08:00
Sam Steingold
c1b4afacf5 * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
Do not error out when `func' is nil.
2011-02-03 14:59:17 -05:00
Paul Eggert
67342916c9 allow C code to suppress warnings about ignored return values 2011-02-03 11:29:35 -08:00
Paul Eggert
90b750f4e2 * texinfo.tex: Update to version 2011-02-01.10 2011-02-03 11:29:10 -08:00
Jan Djärv
36941b32f3 * xterm.c (x_connection_closed): Remove all calls that calls XSync.
Fixes: debbugs:7949
2011-02-03 14:46:03 +01:00
Michael Albinus
a857d3c7c0 * net/tramp-sh.el (tramp-remote-path): Add default settings for
`tramp-default-remote-path' to the docstring.
(tramp-get-remote-path): Suppress error message when `getconf
PATH' fails.

* net/tramp-smb.el (tramp-smb-errors): Add "NT_STATUS_UNSUCCESSFUL".
2011-02-03 12:28:16 +01:00
Michael Albinus
0543d43d48 * tramp.texi (Frequently Asked Questions): Mention problems with WinSSHD. 2011-02-03 10:43:54 +01:00
Glenn Morris
0e751a49bb Small faq.texi changes.
* doc/misc/faq.texi (Contacting the FSF): Mainly just refer to the web-site.
(Binding combinations of modifiers and function keys):
Let's assume people reading this are not using Emacs 18.
2011-02-02 23:37:43 -08:00
Glenn Morris
219ea611fd * lisp/vc/vc-hg.el (vc-hg-command): Doc fix. 2011-02-02 23:33:16 -08:00
Glenn Morris
8d7b5b5ba9 * lisp/term/w32-win.el (libpng-version): Declare for compiler. 2011-02-02 23:31:42 -08:00
Glenn Morris
c03eac3473 * lisp/msb.el: No need to load dired while compiling. 2011-02-02 23:29:38 -08:00
Glenn Morris
7f07c1fe57 elint.el trivia.
* lisp/emacs-lisp/elint.el (elint-standard-variables):
Remove a couple of built-ins that now have doc-strings.
2011-02-02 23:27:59 -08:00
Glenn Morris
5a6a61f77f Silence some compiler warnings.
* lisp/gnus/nnheader.el (gnus-range-add, gnus-remove-from-range): Autoload.

* lisp/gnus/nnimap.el (gnus-fetch-headers): Declare.
2011-02-02 23:25:14 -08:00
Glenn Morris
befe199d3a require' is automatically eval-and-compile'd.
* hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el:
`require' is automatically `eval-and-compile'd.
2011-02-02 23:21:56 -08:00