Martin Rudalics [Thu, 4 Nov 2010 13:26:46 +0000 (14:26 +0100)]
Merge with trunk. Add even-window-sizes and adjust-width buffer display
specifiers. Redesign adjust-height buffer display specifier. Adjust
callers in compile.el.
* window.el (display-buffer-names, display-buffer-regexps): Make
even-window-sizes a seperate specifier. Allow numbers and
functions in the cdr of the adjust-height specifier and remove
even-window-heights and the special handling of
fit-window-to-buffer and shrink-window-if-larger-than-buffer.
Add new specifier adjust-width similar to adjust-height.
(display-buffer-normalize-specifiers-1): Fix typo.
(display-buffer-even-sizes, display-buffer-adjust-height)
(display-buffer-adjust-width): New functions to handle size
adjustment of new window.
(display-buffer-adjust-heights): Remove.
(display-buffer-in-window): Don't call
display-buffer-adjust-heights any more.
(display-buffer-in-lru-buffer-window)
(display-buffer-in-lru-window): Call display-buffer-even-sizes.
(display-buffer-in-new-window): Use functionp instead of
fboundp. Call display-buffer-adjust-height and
display-buffer-adjust-width.
(display-buffer): Use functionp instead of fboundp.
(fit-window-to-buffer): Rename argument IGNORE to OVERRIDE.
* progmodes/compile.el (compilation-start)
(compilation-goto-locus): Use adjust-height specifier in
display-buffer calls.
Martin Rudalics [Tue, 2 Nov 2010 17:04:40 +0000 (18:04 +0100)]
Provide new semantics for cdr of `not-this-window' and `not-this-frame'
specifiers when passed as argument to `display-buffer'. Use buffer
display specifiers in compilation functions.
* window.el (display-buffer-names): Describe `not-this-window' and
`not-this-frame' specifiers in doc-string.
(display-buffer-in-lru-buffer-window)
(display-buffer-in-lru-window, display-buffer-in-new-window):
Handle `not-this-window' and `not-this-frame' specifiers when
their cdr specifies a window or a frame.
(display-buffer): Explain in doc-string that the cdr of the
`not-this-window' and `not-this-frame' specifiers argument can
name a window.
* progmodes/compile.el (compilation-start): When displaying outbuf
directly pass height parameters.
(compilation-goto-locus): Use specifiers in display-buffer and
pop-to-buffer calls. Simplify.
(compilation-find-file): Use specifiers in display-buffer calls.
* windows.texi (Displaying Buffers): Describe special handling
of `not-this-window' and `not-this-frame' specifiers for
`display-buffer'.
Katsumi Yamaoka [Tue, 2 Nov 2010 02:19:52 +0000 (02:19 +0000)]
gnus-cite.el (gnus-article-fill-cited-article): Make fill work properly for XEmacs as well.
gnus-cite.el (gnus-article-fill-cited-article, gnus-article-foldable-buffer, gnus-article-natural-long-line-p): Use window-width rather than frame-width.
Chong Yidong [Tue, 2 Nov 2010 01:50:26 +0000 (21:50 -0400)]
Two fixes for elpa packages overriding built-in ones.
* emacs-lisp/package.el (package-initialize): Ensure that
obsoleted built-in packages are not in package-activated-list
during activation.
(describe-package-1): Make the "installed" status override
"built-in".
gnus-sum.el (gnus-print-buffer): Rewrite to use with-temp-buffer.
gnus-sum.el (gnus-print-buffer): Just print the buffer as is.
gnus-cite.el (gnus-article-foldable-buffer): Protect against degenerate articles.
nnimap.el (nnimap-parse-line): Don't bug out oddly formed replies (bug #7311).
gnus-cite.el (gnus-article-fill-cited-article): Minimize the long-lines case by only filling the long lines.
gnus-start.el (gnus-ask-server-for-new-groups): Return the new groups.
gnus-group.el (gnus-group-find-new-groups): Display all the new groups.
gnus-start.el (gnus-find-new-newsgroups): Return the list of new groups.
nnimap.el (nnimap-request-group): Store the new updated info.
nnimap.el (nnimap-request-group): Select the group when we don't know whether it exists or not.
Glenn Morris [Mon, 1 Nov 2010 07:40:11 +0000 (00:40 -0700)]
Reposition some aliases in holidays.el.
* lisp/calendar/holidays.el (general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays, christian-holidays)
(islamic-holidays, bahai-holidays, solar-holidays): Move aliases before
the definitions of their targets.
(The position doesn't actually matter so long as the aliases are autoloaded).
Katsumi Yamaoka [Mon, 1 Nov 2010 03:58:53 +0000 (03:58 +0000)]
gnus-util.el (gnus-string-match-p): New function, that is an alias to string-match-p in Emacs >=23.
gnus-msg.el (gnus-configure-posting-styles)
nnir.el (nnir-run-gmane): Use gnus-string-match-p.
Gnus developers [Sun, 31 Oct 2010 22:31:24 +0000 (22:31 +0000)]
Merge changes made in Gnus trunk.
nnimap.el (nnimap-open-connection): Only send AUTHENTICATE PLAIN if LOGINDISABLED is set.
gnus.el (gnus-group-startup-message): Move point to the start of the buffer.
nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to reflect the order they're in in the digest.
gnus-sum.el (gnus-summary-select-article): Make `C-d' work reliably by checking whether the original article buffer is alive.
shr.el (shr-find-fill-point): Don't break lines between punctuation and non-punctuation (like after the apostrophe in "'We").
gnus-cite.el (gnus-article-fill-cited-article): Remove unused `force' parameter.
gnus-art.el (gnus-treatment-function-alist): Have gnus-treat-fill-long-lines point to gnus-article-fill-cited-long-lines.
gnus-art.el (gnus-treat-fill-long-lines): Change default to fill all text/plain sections.
gnus.el: Autoload gnus-article-fill-cited-long-lines.
gnus-art.el (gnus-mime-display-alternative): Actually pass the type on to `gnus-treat-article'.
gnus-sum.el (gnus-summary-show-article): Add `C-u C-u g' for showing the raw article, and change `C-u g' to show the article without doing treatments.
gnus.texi (Paging the Article): Document C-u g/C-u C-u g.
gnus-cite.el (gnus-article-foldable-buffer): Refactor out.
gnus-cite.el (gnus-article-foldable-buffer): Don't fold regions that have a ragged left edge.
gnus-cite.el (gnus-article-foldable-buffer): Skip past the prefix when determining raggedness.
gnus-srvr.el, nnir.el: Allow nnir searching for an entire server.
gnus-msg.el (gnus-configure-posting-styles): Permit the use of regular expression match and replace in posting styles.
gnus-art.el (gnus-treat-article): Only inhibit body washing, and leave the header washing to take place.
nnimap.el (nnimap-request-accept-article): Erase buffer before appending for easier debugging.
nnimap.el (nnimap-wait-for-connection): Take a regexp.
nnimap.el (nnimap-request-accept-article): Wait for the continuation line before sending anything unless we're streaming.
Glenn Morris [Sun, 31 Oct 2010 18:26:54 +0000 (11:26 -0700)]
Fix bug#7299; default value of tool-bar-mode in without-x builds.
* src/frame.c (syms_of_frame) <tool-bar-mode>:
Default to nil if !HAVE_WINDOW_SYSTEM.
* lisp/cus-start.el: Handle standard values via a keyword.
Only set version property if specified.
(cursor-in-non-selected-windows, menu-bar-mode)
(tool-bar-mode, show-trailing-whitespace):
Do not specify standard values.
(transient-mark-mode, temporary-file-directory): Use :standard.
Chong Yidong [Sun, 31 Oct 2010 03:33:56 +0000 (23:33 -0400)]
Print informative error message when aborting on GTK disconnect.
* xterm.c (x_connection_closed): Print informative error message
when aborting on GTK. This requires using shut_down_emacs
directly instead of Fkill_emacs.
Gnus developers [Sun, 31 Oct 2010 00:13:12 +0000 (00:13 +0000)]
Merge changes made in Gnus trunk.
nnir.el: General clean-up, and reimplementation of various bits.
nnir.el (nnir-search-engine): Ressurect variable, since it's used later in the file.
shr.el (shr-generic): The text nodes should be text, not :text.
nnir.el: Move defvars around to silence compiler warnings.
shr.el (shr-tag-img): Output "*" instead of "[img]".
Alan Mackenzie [Sat, 30 Oct 2010 12:24:06 +0000 (12:24 +0000)]
progmodes/cc-fonts.el (c-font-lock-enum-tail): New function which
fontifies the tail of an enum.
(c-basic-matchers-after): Insert a call to the above new function.
This fixes bug #7264.
Martin Rudalics [Sat, 30 Oct 2010 09:31:16 +0000 (11:31 +0200)]
Provide new semantics for variable display-buffer-window (former
display-buffer-window-and-buffer) and quit-restore window parameter.
* window.el (window-deletable-p, quit-restore-window): Adapt to
new quit-restore semantics.
(split-window-quit-restore): Remove.
(split-window-vertically, split-window-horizontally):
Unconditionally copy quit-restore parameter to new window.
(display-buffer-names): Mention quit-restore window parameter.
(display-buffer-window-and-buffer): Rename to
display-buffer-window and rewrite doc-string.
(display-buffer-in-window, display-buffer-in-lru-buffer-window)
(display-buffer-in-lru-window, display-buffer-in-new-window)
(display-buffer-in-new-frame, display-buffer): Move quit-restore
parameter handling from display-buffer-in-window to the callers.
Set display-buffer-window.
* help.el (help-window-setup, with-help-window): Use
display-buffer-window insted of display-buffer-window-and-buffer
and adapt to new semantics of the former.
* windows.texi (Buffers and Windows, Displaying Buffers): Adapt
to new semantics of quit-restore window parameter and
display-buffer-window (was display-buffer-window-and-buffer)
semantics.
Gnus developers [Sat, 30 Oct 2010 05:59:34 +0000 (05:59 +0000)]
Merge changes made in Gnus trunk.
gnus.el: Remove `gnus-nntp-service' variable.
gnus.el: Make gnus-nntp-server and gnus-secondary-servers obsolete.
gnus-sum.el (gnus-summary-delete-marked-as-read, gnus-summary-delete-marked-with): Remove obsolete defalias.
gnus.el (gnus-use-long-file-name): Fix docstring.
nnimap.el (nnimap-open-connection): Use AUTHENTICATE PLAIN on servers that say they support that.
gnus-msg.el (gnus-inews-do-gcc): Don't have the backends do the slow *-request-group, which seems unnecessary.
gnus-group.el (gnus-group-get-new-news-this-group): Don't have point move to the previous line on `M-g'.
nnimap.el (nnimap-split-incoming-mail): Note that the INBOX has been selected.
nnimap.el: Allow the user to say whether to split old messages or not in nnimap.
shr.el (shr-tag-table-1): Only insert the images after the top-level table.
shr.el (shr-tag-span): Drop colorisation of regions since we don't control the background color.
shr.el (shr-tag-img): Ignore very small web bug type images.
shr.el (shr-put-image): Add help-echo alt texts to the images.
shr.el (shr-tag-video): Show the video poster image.
Glenn Morris [Sat, 30 Oct 2010 02:27:44 +0000 (19:27 -0700)]
Fix bug#7306; customization of minor-mode variables defined in C.
* lisp/cus-start.el: Add :set properties for minor modes menu-bar-mode,
tool-bar-mode, transient-mark-mode.
Include the :set property in the dumped Emacs.
Stefan Monnier [Fri, 29 Oct 2010 19:20:28 +0000 (15:20 -0400)]
SMIE: change indent rules format, improve smie-setup.
* lisp/emacs-lisp/smie.el (smie-precs-precedence-table)
(smie-merge-prec2s, smie-bnf-precedence-table, smie-prec2-levels):
Mark them pure so the tables gets built at compile time.
(smie-bnf-precedence-table): Store the closer-alist in the table.
(smie-prec2-levels): Preserve the closer-alist.
(smie-blink-matching-open): Be more forgiving in case of indentation.
(smie-hanging-p): Rename from smie-indent--hanging-p.
(smie-bolp): Rename from smie-indent--bolp.
(smie--parent, smie--after): New dynamic vars.
(smie-parent-p, smie-next-p, smie-prev-p): New funs.
(smie-indent-rules): Remove.
(smie-indent--offset-rule): Remove fun.
(smie-rules-function): New var.
(smie-indent--rule): New fun.
(smie-indent--offset, smie-indent-keyword, smie-indent-after-keyword)
(smie-indent-exps): Use it.
(smie-setup): Setup paren blinking; add keyword args for token
functions; extract closer-alist from op-levels.
(smie-indent-debug-log): Remove var.
(smie-indent-debug): Remove fun.
* lisp/progmodes/prolog.el (prolog-smie-indent-rules): Remove.
(prolog-smie-rules): New fun to replace it.
(prolog-mode-variables): Simplify.
* lisp/progmodes/octave-mod.el (octave-smie-closer-alist): Remove, now that
it's setup automatically.
(octave-smie-indent-rules): Remove.
(octave-smie-rules): New fun to replace it.
(octave-mode): Simplify.
Eli Zaretskii [Fri, 29 Oct 2010 10:49:27 +0000 (12:49 +0200)]
Fix doc/misc/makefile.w32.in like 2010-10-28T07:21:43Z!rgm@gnu.org did with Makefile.in.
makefile.w32-in (MAKEINFO): Add -I$(emacsdir).
(ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO).
($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO).
($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi.
Eli Zaretskii [Fri, 29 Oct 2010 10:43:38 +0000 (12:43 +0200)]
Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.
emacs.c (main): Call syms_of_filelock unconditionally.
filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
clause, but keep part of it conditioned on CLASH_DETECTION.
Glenn Morris [Fri, 29 Oct 2010 03:19:33 +0000 (20:19 -0700)]
Correct some viewcvs links in docs and comments.
* doc/misc/cc-mode.texi: Remove reference to defunct viewcvs URL.
Instead, refer to the generic Savannah page, since it seems likely
that Savannah will never provide the equivalent service for GNU bazaar.
The other option would be to use the Git mirror URL, since it seems to
be being updated now, and of course browsing Git repos works just fine.
That would be a pretty poor advert for the GNU system though.
* etc/MH-E-NEWS: Update URL (viewcvs -> viewvc).
* lisp/net/tramp-fish.el: Update URL in comment (viewcvs -> viewvc).
Stefan Monnier [Fri, 29 Oct 2010 01:05:38 +0000 (21:05 -0400)]
* lisp/emacs-lisp/pcase.el (pcase): New `string' and `guard' patterns.
(pcase-if): Add one minor optimization.
(pcase-split-equal): Rename from pcase-split-eq.
(pcase-split-member): Rename from pcase-split-memq.
(pcase-u1): Add strings to the member optimization.
Add `guard' variant of predicates.
(pcase-q1): Add string patterns.