1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Commit Graph

98685 Commits

Author SHA1 Message Date
Paul Eggert
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Gnus developers
01baa1e6f2 nnimap.el (nnimap-wait-for-response): Ensure that we get the entire line we're waiting for.
gnus-art.el (gnus-article-next-page-1): Because customized mode-line face with line-width greater than zero will cause RET in gnus summary buffer to scroll down article page-wise because auto vscroll happens, it should be temporalily disabled when doing a scroll-up.
2011-02-20 04:08:04 +00:00
Glenn Morris
e17816e57e edmacro.el trivia.
* lisp/edmacro.el: Remove old header comment.
(edmacro-eight-bits): Make it a defcustom.  Don't autoload it.
2011-02-19 16:16:54 -08:00
Glenn Morris
18cfb5a1ea autorevert.el trivia.
* lisp/autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-ignore-buffer): Remove leading "*" from docs.
It makes zero sense to use it with these variables.
2011-02-19 16:09:28 -08:00
Dmitry Bolshakov
a87af185c9 Prevent hideshow from parsing braces inside comments (Bug#8036).
* progmodes/hideshow.el (hs-find-block-beginning)
(hs-hide-level-recursive): Ignore comments when parsing braces.
2011-02-19 17:20:35 -05:00
Chong Yidong
3ab713fdac Improvements to vc-bzr conffile handling and pull/merge support.
* vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
(vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
but returning an alist.  Ignore comments in bzr conffile.
(vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
(vc-bzr-error-regex-alist): New var.
(vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.

* progmodes/compile.el (compilation--flush-directory-cache):
Handle the case where cdr of compilation--flush-directory-cache
points to no buffer, which can occur if we previously switched to
compilation-mode in a pregenerated buffer.

* vc/vc-dispatcher.el (vc-do-async-command): Bind
inhibit-read-only to t.
2011-02-19 16:23:51 -05:00
Glenn Morris
cad7445b36 dired-x no longer requires dired-aux.
* lisp/dired-x.el: Don't require dired-aux.
(dired-do-create-files, dired-mark-read-regexp)
(dired-do-create-files-regexp): Autoload from dired-aux.
2011-02-19 12:44:34 -08:00
Glenn Morris
bea584fae3 Merge dired-x's dired-find-buffer-nocreate into dired.el.
* lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.

* lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-find-buffer-nocreate.
2011-02-19 12:36:54 -08:00
Eli Zaretskii
615d868ee6 Adapt and fix the MS-DOS port due to gnulib imports.
msdos/depfiles.bat: New file.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 (lib, lib-src, src): Specify "all" as an explicit target.
 .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
 Add lib/deps/.
 config.bat: Configure in `lib'.
 Generate *.Po files in lib/deps.
 src/termcap.c (tputs): Don't declare baud_rate.
 src/s/msdos.h (strtold): Define to _strtold.
2011-02-19 21:56:29 +02:00
Eli Zaretskii
83627c032a Fix MS-DOS build in src/: delete gl-tmp.
msdos/sed1v2.inp: Delete gl-tmp after updating globals.h
2011-02-19 21:49:10 +02:00
Eli Zaretskii
f601db19da Finish fixing the MS-DOS build. Everything builds and works.
src/termcap.c (tputs): Don't declare baud_rate.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
2011-02-19 21:41:00 +02:00
Glenn Morris
67ab0163d6 Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca 2011-02-19 11:40:59 -08:00
Chong Yidong
27ac6e7908 Fix typo in auth.texi (Bug#8068). 2011-02-19 14:26:37 -05:00
Glenn Morris
d6e96966e8 Merge dired-x's dired-read-shell-command into dired-aux's version.
* lisp/dired-x.el (dired-read-shell-command): Merge into dired-aux's version.

* lisp/dired-aux.el (dired-read-shell-command): Merge dired-x's version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-read-shell-command.
2011-02-19 11:20:38 -08:00
Glenn Morris
429242317e Merge dired-x's dired-clean-up-after-deletion into dired's version.
* lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.

* lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
(dired-clean-up-buffers-too): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefine dired-clean-up-after-deletion.
2011-02-19 10:55:15 -08:00
Eli Zaretskii
534e4e80e6 Fix msdos/sed3v2.inp. lib-src/ now builds.
sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit target.
2011-02-19 19:54:18 +02:00
Eli Zaretskii
27087453c9 Fix msdos/sedlibmk.inp. lib/ builds now.
sedlibmk.inp (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
 editing.
 (DEFS): Edit to -DHAVE_CONFIG_H.
 (Makefile, &&): Fix removal.
2011-02-19 19:35:11 +02:00
Chong Yidong
f6ed3dbe85 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html
2011-02-19 12:34:50 -05:00
Eli Zaretskii
219463da10 Fix generation of auto-dependency files in lib/.
.bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.
2011-02-19 18:53:10 +02:00
Eli Zaretskii
152be435b9 Update .bzrignore for files produced by the MS-DOS build.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
2011-02-19 18:12:18 +02:00
Eli Zaretskii
9d9ce65995 Commit new Sed scripts in msdos/. 2011-02-19 18:05:27 +02:00
Eli Zaretskii
9d9d12cdf3 Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
Kenichi Handa
51a1211543 merge emacs-23 2011-02-19 19:46:49 +09:00
Paul Eggert
ff05203ec6 * deps.mk (fns.o): Depend on ../lib/md5.h. 2011-02-19 01:51:59 -08:00
Gnus developers
56e96bed34 nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK" outputs from the server.
gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook later so that bbdb can hook in easier.
2011-02-19 09:45:07 +00:00
Eli Zaretskii
2db8710ecf dired.el: Update autoloads. 2011-02-19 04:35:15 -05:00
Kenichi Handa
16bc9688d8 Fix setting of buffer-file-coding-system for MIME message. 2011-02-19 18:22:24 +09:00
Paul Eggert
5f90be1bb7 Import simpler crypto/md5 module from gnulib, plus stdint module.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
* src/config.in: Regenerate.
* lib/md5.c, lib/md5.h: Regenerate with simpler version, which
assumes C99-style <stdint.h>, supplied by the stdint module.
* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4: New files,
generated from gnulib.
* src/deps.mk (fns.o): Do not depend on md5.h, fixing a typo in
the earlier patch.
2011-02-18 23:28:29 -08:00
Paul Eggert
f12f551b2c Merge from mainline. 2011-02-18 22:25:05 -08:00
Glenn Morris
203784ccb1 Merge dired-x's redefinition of dired-initial-position into the main version.
* lisp/dired-x.el (dired-initial-position): Merge into dired.el's version.

* lisp/dired.el (dired-initial-position): Merge dired-x's version here.
(dired-find-subdir): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-initial-position.
2011-02-18 20:12:23 -08:00
Glenn Morris
8c62c205ff * doc/emacs/dired.texi (Dired): Dired-X version number was dropped. 2011-02-18 20:06:40 -08:00
Glenn Morris
30abce25f2 Merge dired-x's dired-add-entry modifications into the main definition.
* lisp/dired-aux.el (dired-add-entry): Give it a doc-string.
Merge dired-x's dired-omit handling here.
(dired-omit-mode, dired-omit-regexp, dired-omit-localp): Declare.

* lisp/dired-x.el (dired-omit-new-add-entry): Merge into dired-add-entry.

* doc/misc/dired-x.texi (Technical Details): No longer redefines
dired-add-entry.
2011-02-18 19:53:35 -08:00
Glenn Morris
4d737eb2db mule-diag.el fix for bug#8066.
* lisp/international/mule-diag.el (list-input-methods-1):
Indent all lines of multi-line doc-strings.
2011-02-18 19:38:45 -08:00
Lars Ingebrigtsen
0d873e93b7 auth-source.el (auth-source-search): If we don't find a match, don't bug out on non-bound variables.
(auth-source-search): Only ask a single backend to create the credentials.
2011-02-18 23:15:24 +00:00
Chong Yidong
abd20d91ab Fix incorrect changes introduced in 2011-02-02T17:59:44Z!sds@gnu.org.
* lisp/apropos.el (apropos-print): Call apropos-mode before setting up
buffer variables.  Use inhibit-read-only.

* lisp/emacs-lisp/package.el (package--list-packages): Call
package-menu-mode before setting up buffer variables.

* lisp/play/solitaire.el (solitaire): Call solitaire-mode before
setting up buffer variables.  Use inhibit-read-only.
2011-02-18 17:52:58 -05:00
Karl Chen
b166dcd8bb * lib-src/emacsclient.c (main): Loop while `recv' return EINTR. 2011-02-18 17:28:09 -05:00
Lawrence Mitchell
e697fcfc01 * lisp/progmodes/sh-script.el (sh-syntax-propertize-here-doc):
Bind case-fold-search to nil when looking for end of here-doc.

Fixes: debbugs:8053
2011-02-18 16:46:08 -05:00
Eli Zaretskii
ec2027bfa3 Still more followup for bug #7942. 2011-02-18 21:11:04 +02:00
Eli Zaretskii
2a3ae860f5 doc/misc/eieio.texi: More followup for bug #7942. 2011-02-18 21:07:44 +02:00
Eli Zaretskii
e979a521f3 Followup for fixing bug #7942.
doc/lispref/elisp.texi: Sync @dircategory with ../../info/dir.
 doc/lispintro/emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
 doc/misc/ede.texi: Sync letter-case with ../../info/dir.
2011-02-18 21:03:59 +02:00
Eli Zaretskii
4114ed61cd Fix bug #8047 with require-final-newline in binary image buffers.
image-mode.el (image-toggle-display-image): Set
 find-file-literally non-nil in buffers visiting binary image
 files.
2011-02-18 19:59:06 +02:00
Eli Zaretskii
61aa93ed0d Fix bug #8047 with require-final-newline and image file display.
image-mode.el (image-toggle-display-image): Disable
 require-final-newline in buffers visiting binary image files.
2011-02-18 19:51:15 +02:00
Stefan Monnier
cbe81f1d96 * alloc.c (make_unibyte_string): Don't SET_UNIBYTE redundantly.
* process.c (Fstart_process, Fmake_serial_process)
(Fmake_network_process, server_accept_connection):
Use empty_unibyte_string.
2011-02-18 12:37:30 -05:00
Stefan Monnier
aa56f3613e * lisp/files.el (cd): Make completion obey cd-path.
* lread.c (Qdir_ok): New constant.
(syms_of_lread): Initialize it.
(openp): Don't ignore directories if the predicate returns dir-ok.

Fixes: debbugs:7924
2011-02-18 12:18:16 -05:00
Eli Zaretskii
a167e505d5 Document *SUBSTRING completion for Unicode character names.
international/mule-cmds.el (read-char-by-name, ucs-insert):
 Document completion with asterisk and a substring.
2011-02-18 17:43:22 +02:00
Eli Zaretskii
42af913dd4 xdisp.c (display_line): Fix the change made for bug#7939. 2011-02-18 17:11:10 +02:00
Eli Zaretskii
d6de49a103 Fix bug #7840 with default terminal and keyboard encodings.
terminal.c (create_terminal): Use default-keyboard-coding-system
 and default-terminal-coding-system to initialize coding systems of
 the new terminal.
2011-02-18 16:48:28 +02:00
Eli Zaretskii
0c973505c8 Synchronize @dircategory directives in doc/misc with info/dir.
ada-mode.texi: Sync @dircategory with ../../info/dir.
 auth.texi: Sync @dircategory with ../../info/dir.
 autotype.texi: Sync @dircategory with ../../info/dir.
 calc.texi: Sync @dircategory with ../../info/dir.
 cc-mode.texi: Sync @dircategory with ../../info/dir.
 cl.texi: Sync @dircategory with ../../info/dir.
 dbus.texi: Sync @dircategory with ../../info/dir.
 dired-x.texi: Sync @dircategory with ../../info/dir.
 ebrowse.texi: Sync @dircategory with ../../info/dir.
 ede.texi: Sync @dircategory with ../../info/dir.
 ediff.texi: Sync @dircategory with ../../info/dir.
 edt.texi: Sync @dircategory with ../../info/dir.
 eieio.texi: Sync @dircategory with ../../info/dir.
 emacs-mime.texi: Sync @dircategory with ../../info/dir.
 epa.texi: Sync @dircategory with ../../info/dir.
 erc.texi: Sync @dircategory with ../../info/dir.
 eshell.texi: Sync @dircategory with ../../info/dir.
 eudc.texi: Sync @dircategory with ../../info/dir.
 flymake.texi: Sync @dircategory with ../../info/dir.
 forms.texi: Sync @dircategory with ../../info/dir.
 gnus.texi: Sync @dircategory with ../../info/dir.
 idlwave.texi: Sync @dircategory with ../../info/dir.
 mairix-el.texi: Sync @dircategory with ../../info/dir.
 message.texi: Sync @dircategory with ../../info/dir.
 mh-e.texi: Sync @dircategory with ../../info/dir.
 newsticker.texi: Sync @dircategory with ../../info/dir.
 nxml-mode.texi: Sync @dircategory with ../../info/dir.
 org.texi: Sync @dircategory with ../../info/dir.
 pcl-cvs.texi: Sync @dircategory with ../../info/dir.
 pgg.texi: Sync @dircategory with ../../info/dir.
 rcirc.texi: Sync @dircategory with ../../info/dir.
 reftex.texi: Sync @dircategory with ../../info/dir.
 remember.texi: Sync @dircategory with ../../info/dir.
 sasl.texi: Sync @dircategory with ../../info/dir.
 sc.texi: Sync @dircategory with ../../info/dir.
 semantic.texi: Sync @dircategory with ../../info/dir.
 ses.texi: Sync @dircategory with ../../info/dir.
 sieve.texi: Sync @dircategory with ../../info/dir.
 smtpmail.texi: Sync @dircategory with ../../info/dir.
 speedbar.texi: Sync @dircategory with ../../info/dir.
 trampver.texi [emacs]: Set emacsname to "Emacs".
 tramp.texi: Sync @dircategory with ../../info/dir.
 url.texi: Sync @dircategory with ../../info/dir.
 vip.texi: Sync @dircategory with ../../info/dir.
 viper.texi: Sync @dircategory with ../../info/dir.
 widget.texi: Sync @dircategory with ../../info/dir.
 woman.texi: Sync @dircategory with ../../info/dir.
2011-02-18 15:57:53 +02:00
Eli Zaretskii
e03b2fd40d Document find-file-literally in the ELisp manual.
files.texi (Visiting Functions): Document find-file-literally,
 both the command and the variable.
2011-02-18 12:23:51 +02:00
Eli Zaretskii
86ec878a6b Improve documentation of permanent local variables.
variables.texi (Creating Buffer-Local): Explain the meaning of
 permanent local variables.
2011-02-18 12:04:48 +02:00