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

98232 commits

Author SHA1 Message Date
Eli Zaretskii
f915f0f7c8 Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de.
lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
2011-01-29 14:36:11 +02:00
Jan Djärv
497a1925ec Handle nul-character in copy/paste (Bug#7934).
* nsselect.m (ns_string_from_pasteboard): Get length of string
and use make_string instead of build_string.
(ns_string_to_pasteboard_internal): Use initWithBytesNoCopy
instead of stringWithUTF8String  (Bug#7934).
2011-01-29 12:30:11 +01:00
Daiki Ueno
8907f7b936 Don't throw an error when any of encryption subkeys are expired.
* epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Don't
presume KEYEXPIRED and KEYREVOKED to be a fatal error status
(Bug#7931).
2011-01-29 20:05:35 +09:00
Jan Djärv
481ae0855f Handle floating point errors in ns-fonts (Bug#7887).
* nsfont.m (nsfont_open): Ensure that fonts with inexact
descenders would not become one pixel too tall (Bug#7887).
2011-01-29 11:36:16 +01:00
Stefan Monnier
e52f87a1c0 * lisp/progmodes/compile.el: Avoid an N² behavior in grep.
(compilation--previous-directory): New fun.
(compilation--previous-directory-cache): New var.
(compilation--remove-properties): Flush it.
(compilation-directory-properties, compilation-error-properties):
Use the new fun to speed up looking for the current directory.
2011-01-29 01:08:24 -05:00
Chong Yidong
659114fdba Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
* lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
the other way around.

* lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
(vc-git-merge-branch): New functions.
(vc-git-history): New var.

* lisp/vc/vc-hg.el (vc-hg-history): New var.
(vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
(vc-hg-merge-branch): New function.
2011-01-28 22:12:32 -05:00
Lars Ingebrigtsen
bc68bd3998 gnus-art.el (article-update-date-lapsed): Try a better way to really keep point at the "same place". 2011-01-29 02:29:38 +00:00
Chong Yidong
9bfe578343 Convert vc-bzr-async-command into a general vc-do-async-command facility.
* vc/vc-dispatcher.el (vc-do-async-command): New function.

* vc/vc-bzr.el (vc-bzr-async-command): Convert into a wrapper for
vc-do-async-command.

* vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch): Callers changed.
2011-01-28 18:10:55 -05:00
Gnus developers
54b6f6edb8 Merge changes made in Gnus trunk.
gnus-win.el: Remove dead function gnus-window-configuration-element.
 (gnus-all-windows-visible-p): Remove old compatibility code.
 (gnus-window-top-edge): Add docstring.
gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active data if the group is unactivated.
2011-01-28 23:07:38 +00:00
Stefan Monnier
9ffae6d024 * progmodes/compile.el: Don't use font-lock any more. 2011-01-28 17:12:05 -05:00
Stefan Monnier
55fb901352 * lisp/progmodes/compile.el: Don't use font-lock any more.
(compilation-error-regexp-alist-alist): Change handling of makepp
so it preserves the warning/error distinction on subsequent files.
Simplify various rules.
(compilation-directory-properties): Use font-lock-face.
Add a compilation-message property.
(compilation-internal-error-properties): Use font-lock-face.
Don't set the compilation-debug property here.
(compilation--put-prop, compilation--remove-properties)
(compilation--parse-region, compilation--ensure-parse)
(compilation--ensure-parse): New functions.
(compilation-parse-errors): New function, largely inspired of
compilation-mode-font-lock-keywords.  Set compilation-debug here.
(compilation--parsed): New var.
(compilation--flush-parse): Use compilation--ensure-parse.
(compilation-start): Don't call font-lock.
(compilation-turn-on-font-lock): Remove.
(compilation-setup): Don't set font-lock-extra-managed-props not change
other font-lock settings, other than keywords.
Don't activate font-lock-mode.
Set change-major-mode-hook and before-change-functions.
(compilation--unsetup): Remove properties and hooks.
(compilation-next-single-property-change): New function.
(compilation-next-error): Use it to parse when needed.
(compile-goto-error): Parse buffer as needed.
(compilation--compat-error-properties): Don't need a dummy `face'
property any more.
2011-01-28 17:06:20 -05:00
Stefan Monnier
8fe5238438 * lisp/progmodes/compile.el: Use accessors for clarity and fix omake hack.
(compilation-process-setup-function): Fix docstring's false promises.
(compilation-error-regexp-alist-alist): Catch omake's continuous
recompilation message and avoid reuse of old markers.
(compilation-parse-errors-function): Declare obsolete.
(compilation-buffer-modtime): Remove.
(compilation--make-cdrloc, compilation--loc->col)
(compilation--loc->line, compilation--loc->file-struct)
(compilation--loc->marker, compilation--loc->visited)
(compilation--make-file-struct, compilation--file-struct->file-spec)
(compilation--file-struct->formats)
(compilation--file-struct->loc-tree): New macros.  Use them.
(compilation--message): New defstruct.  Use them.
(compilation-next-error-function): Don't mess with timestamps to try
and guess when to reparse.
2011-01-28 16:42:34 -05:00
Leo Liu
b1ea593c81 Fix help-mode highlighting of advice warning (Bug#6304).
* emacs-lisp/advice.el (ad-make-advised-docstring): Don't apply
highlighting to the "this function is advisted" message.

* help-mode.el (help-mode-finish): Apply highlighting here, to
avoid clobbering by substitute-command-keys (Bug#6304).
2011-01-28 16:42:11 -05:00
Chong Yidong
40e22d80ae Fix for woman escape sequence processing (Bug#7843).
* lisp/woman.el (woman0-roff-buffer): Process roff escape sequences
occurring prior to the first request.
2011-01-28 16:20:40 -05:00
Stefan Monnier
5e853d0190 * lisp/textmodes/tex-mode.el: Get rid of compilation-parse-errors-function
(tex-old-error-file-name): New function,
extracted from tex-compilation-parse-errors.
(tex-compilation-parse-errors): Remove.
(tex-error-regexp-alist): New var.
(tex-shell): Use it to avoid compilation-parse-errors-function.
2011-01-28 16:16:04 -05:00
Stefan Monnier
07b741a76a Minor cleanup for compile.el and grep.el.
* lisp/progmodes/compile.el: Cleanup text-properties namespace by using
`compilation-message' instead of `message', `compilation-directory'
instead of `directory', and `compilation-debug' instead of `debug'.
(compilation-last-buffer, compilation-parsing-end)
(compilation-error-list, compilation-old-error-list): Move to the
compatibility part of the code.
(compilation-error-properties): If `file' is a function, let it return
a file name.
(compilation-mode-font-lock-keywords): Be more conservative with the
omake "^ *" pattern prefix, to try and minimize the risk of
pathologically slow regexp matching.
(compilation-start): Use inhibit-read-only.
(compilation--unsetup): New function.
(compilation-shell-minor-mode, compilation-minor-mode): Use it.
(compilation-filter): Minor tweaks.
(compilation-next-error-function): Try and avoid abusing variable names.
(compilation--flush-file-structure): New fun.
(compilation-fake-loc): Use it for cleaner behavior when file is reused.
(debug-ignored-errors): Add "Moved past last ...".
(compilation--compat-error-properties)
(compilation--compat-parse-errors): Rename by doubling the "-".

* lisp/progmodes/grep.el (grep-regexp-alist): Tighten regexp.
(grep-mode-font-lock-keywords): Remove regexp that seems like
a left-over from before we used compile.el.
(grep-mode-font-lock-keywords): Call syntax-ppss-flush-cache when
modifying the buffer within with-silent-modifications.
2011-01-28 16:11:19 -05:00
Chong Yidong
6b91861333 Fix text pos part of lispy positions for right fringe clicks (Bug#7839).
* src/keyboard.c (make_lispy_position): For clicks on right fringe or
margin, compute text position using the X coordinate relative to
the left of the text area (Bug#7839).
2011-01-28 15:30:38 -05:00
Stefan Monnier
01c63f4ce4 Port features from the previous prolog.el to the new one.
* lisp/progmodes/prolog.el (prolog-system): Add GNU and ECLiPSe options.
(prolog-program-name, prolog-program-switches, prolog-consult-string)
(prolog-compile-string, prolog-prompt-regexp): Get rid of the <foo>-i
variable and use a function to compute the value dynamically.
(prolog-prompt-regexp): Add regexp for GNU Prolog.
(prolog-continued-prompt-regexp): Remove, unused.
(prolog-find-value-by-system): Try and use the value of prolog-system
in the *prolog* buffer if it helps.
(prolog-mode-keybindings-common): Bind C-c C-z unconditionally...
(prolog-zip-on): ..and check prolog-system and version here instead.
(prolog-inferior-self-insert-command): New command.
(prolog-inferior-mode-map): Use it.
(prolog-inferior-error-regexp-alist): New var.
(prolog-inferior-mode): Use it, along with compilation-shell-minor-mode.
(prolog-input-filter): Use derived-mode-p.
(prolog-inferior-guess-flavor): New function.
(prolog-ensure-process): Use it.  Use make-comint-in-buffer rather than
make-comint to avoid running comint-mode twice.
(prolog-inferior-buffer): New fun.
(prolog-old-process-region, prolog-old-process-file):
Don't call prolog-bsts here...
(prolog-build-prolog-command): ...do it here instead.
(prolog-old-process-region, prolog-old-process-file):
Use compilation-fake-loc and compilation-forget-errors.
(prolog-consult-compile-region): Use bolp.
2011-01-28 14:46:58 -05:00
Chong Yidong
2f224f0b1a * image-mode.el (image-display-size): Doc fix (Bug#7820). 2011-01-28 14:13:01 -05:00
Chong Yidong
2e804fc7e7 Update autoloads. 2011-01-28 11:58:04 -05:00
Kenichi Handa
10339fa903 merge trunk 2011-01-28 21:36:18 +09:00
Kenichi Handa
9e269017e7 (ftfont_spec_pattern): Check each extra property value. 2011-01-28 21:31:39 +09:00
Julien Danjou
584cbd9e0f gnus-group.el (gnus-group-jump-to-group): Set must match to t. 2011-01-28 11:27:24 +00:00
Stefan Monnier
17dd1fc895 * src/xdisp.c (safe_eval_handler): Distinguish symbols and strings. 2011-01-27 23:53:17 -05:00
Lars Ingebrigtsen
9da02ea1b0 gnus-int.el (gnus-request-marks): Call *-request-marks instead of the older request-update-info. 2011-01-28 02:07:48 +00:00
Paul Eggert
007751efe4 Merge: Redo spelling of Makefile variables to conform to POSIX. 2011-01-27 17:53:06 -08:00
Paul Eggert
68b5f85576 Redo spelling of Makefile variables to conform to POSIX. 2011-01-27 17:51:41 -08:00
Lars Ingebrigtsen
d6f13ac876 gnus-art.el (article-make-date-line): Limit the length a bit more.
gnus.texi (Article Date): Document gnus-article-update-lapsed-header.
2011-01-28 01:41:15 +00:00
Daiki Ueno
bb760c5da8 mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Give mml2015-signers higher precedence over mml2015-sign-with-sender. 2011-01-28 01:34:09 +00:00
Paul Eggert
8bb578b203 Merge: improve fix for MS-DOS file name clash 2011-01-27 16:26:43 -08:00
Paul Eggert
c7e95b9146 improve fix for MS-DOS file name clash
* Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4,
for portability to POSIX make.  Reported by Bruno Haible.
(sync-from-gnulib): Copy gl-comp.m4 (if present) back to
gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib
files from accumulating as garbage.  Also reported by Bruno Haible.
2011-01-27 16:25:24 -08:00
Gnus developers
5d85ab5e40 gnus-group.el (gnus-group-refresh-group): Refresh even non-visible groups. This makes the nndraft:queue group pop up if it's not already there.
mml2015.el (mml2015-epg-sign): Add missing paren.
2011-01-28 00:14:08 +00:00
Lars Ingebrigtsen
8937ef6e5e gnus-sum.el (gnus-summary-read-group-1): Fix the "contains no messages" logic, which was reversed. 2011-01-27 23:56:27 +00:00
Chong Yidong
372fb76be9 Convert font parse testsuite to an ERT test.
* test/automated/font-parse-tests.el: Move from
font-parse-testsuite.el.

* src/font.c (font_parse_fcname): Undefine a temporary macro.
2011-01-27 18:45:04 -05:00
Gnus developers
19cc66979d Merge changes made in Gnus trunk.
mml2015.el (mml2015-epg-sign): Add and use mml2015-sign-with-sender.
 (mml2015-epg-encrypt): Use mml2015-sign-with-sender.
gnus-art.el (article-update-date-lapsed): Ensure that point stays at the "same place" even if point is on the line being replaced.
 (article-update-date-lapsed): Allow updating both the combined lapsed and the lapsed headers.
 (article-update-date-lapsed): Skip past all the X-Sent/Date headers.
 (article-make-date-line): Limit the number of segments dynamically to avoid too-long lines.
2011-01-27 23:42:38 +00:00
Chong Yidong
b1ab31aeec Edit NEWS entries about selection changes. 2011-01-27 16:41:47 -05:00
Sam Steingold
db0e305dc0 * lisp/midnight.el (clean-buffer-list-kill-never-buffer-names): Remove
"*server*" which is never created by emacs server.
2011-01-27 14:45:44 -05:00
Deniz Dogan
27bbeb296e * vc/vc-bzr.el (vc-bzr-diff): Don't pass --diff-options unless
there are some diff switches.
2011-01-27 18:51:06 +01:00
Stefan Monnier
89fdaac7aa * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):
Copy change made to ruby-font-lock-syntactic-keywords.
2011-01-27 12:07:48 -05:00
Stefan Monnier
153c5428d2 * lisp/htmlfontify.el: Make it obey the font-lock-face text property.
Miscellaneous cleanup such as:
- Don't hide expressions after a closing paren.
- Move initial setq into let.
- Hoist common parts out of ifs.
(hfy-p-to-face, hfy-p-to-face-lennart): Remove.
(hfy-face-at): Use get-text-property instead.
(hfy-prop-invisible-p): Use invisible-p if available.
(htmlfontify-manual): Use \\[...].
(hfy-html-quote-regex): Use [...].
(hfy-combined-face-spec): Simplify.
(hfy-compile-face-map): Don't presume point-min==1.
(hfy-css-name, hfy-buffer, htmlfontify-buffer): Use \' rather than $ to
match end of string.
(hfy-text-p): η-reduce.
(hfy-tags-for-file): Receive cache-hash directly.
(hfy-mark-tag-names): Adjust call.
2011-01-27 12:04:07 -05:00
Katsumi Yamaoka
14596870e2 shr.el (shr-expand-newlines, shr-previous-newline-padding-width): Use plist-get instead of the cl function getf. 2011-01-27 13:20:55 +00:00
Lars Ingebrigtsen
3f39b52692 shr.el (shr-put-color): Special-case background colours: Do put them at the blank parts at the front of the lines. 2011-01-27 10:27:51 +00:00
Glenn Morris
fb9464eea3 * lisp/gnus/gnus-util.el (float-time): Get rid of compiler warning, again. 2011-01-27 00:38:43 -08:00
Glenn Morris
ed7646d454 msb.el trivia.
* lisp/msb.el (msb-after-load-hooks): Make it an obsolete alias.
(msb-after-load-hook): Remove eval-after-load wackiness.
2011-01-26 23:54:04 -08:00
Paul Eggert
6bead33667 Merge: fix two m4/gnulib-*.m4 file names that clashed under MS-DOS 2011-01-26 23:27:41 -08:00
Paul Eggert
125c3718c2 fix two m4/gnulib-*.m4 file names that clashed under MS-DOS 2011-01-26 23:24:57 -08:00
Glenn Morris
11ea68ce8a Mark tiny change in ChangeLog. 2011-01-26 23:19:26 -08:00
Lars Ingebrigtsen
647559c299 Merge changes made in Gnus trunk.
gnus-art.el (gnus-article-next-page): Change last-line-displayed behaviour.
 (article-lapsed-string): Refactor out and allow specifying how many segments you want.
 (gnus-article-setup-buffer): Start updating the lapsed header directly.
 (gnus-article-update-lapsed-header): New variable.
shr.el (shr-put-color): Don't do the box padding in tables, since they're already padded.
gnus-util.el (float-time): If float-time is bound, always use it on all Emacsen.  It's unclear why the subrp check was there.
 (time-date): Require to make some autoload issues on XEmacs go away.
gnus-draft.el (gnus-draft-clear-marks): New function to be run as an exit hook to nix out all data on readedness on group exit.
gnus-sum.el (gnus-auto-select-subject): Doc typo.
2011-01-27 04:04:58 +00:00
Stefan Monnier
e7f7fbaa11 Let the debugger continue to the normal handler.
* src/eval.c (maybe_call_debugger): Declare before new use.
(find_handler_clause): Don't call debugger any more.
Ignore Vstack_trace_on_error.
Use XCAR/XCDR.
(syms_of_eval): Remove Vstack_trace_on_error.
(Fsignal): Only modify handlerlist when we know we need to do it.
Call the debugger when necessary.
* src/globals.h (Vstack_trace_on_error): Remove.

Fixes: debbugs:7825
2011-01-26 15:02:07 -05:00
Chong Yidong
6608a7d8fb * src/font.c (font_parse_fcname): Rewrite GTK font name parser.
* test/font-parse-testsuite.el (test-font-parse-data): New file.
2011-01-26 13:10:04 -05:00