Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-50

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 185-187)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 71-72)

   - Update from CVS
This commit is contained in:
Miles Bader 2006-03-31 04:56:24 +00:00
commit 91b7e4a6fd
19 changed files with 719 additions and 396 deletions

View file

@ -82,7 +82,6 @@ Look in their Web site http://www.vtw.org/ for background information
and political action recommendations. Censorship won in February, but
we can beat it in November.
Copyright 1996 Richard Stallman
Verbatim copying and distribution is permitted in any medium
provided this notice is preserved.

View file

@ -357,7 +357,11 @@ format=flowed was present but not documented in earlier versions.
** The option `mm-fill-flowed' can be used to disable treatment of
format=flowed messages. Also, flowed text is disabled when sending
inline PGP signed messages. (New in Gnus 5.10.7)
inline PGP signed messages. (New in Gnus 5.10.8)
** The tool bar icons are now (de)activated correctly in the group
buffer, see the variable `gnus-group-update-tool-bar'. It's default
value depends on your Emacs version. (New in Gnus 5.10.8)
** Gnus supports the generation of RFC 2298 Disposition Notification requests.

View file

@ -1470,4 +1470,5 @@ mode: indented-text
fill-prefix: " "
End:
arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473

View file

@ -36,7 +36,7 @@ You might find bug-fixes or enhancements in these places.
* Ada-mode: <URL:http://libre.act-europe.fr/adamode>
* Battery and Info Look: <URL:ftp://ftp.ul.bawue.de/pub/purple/emacs>
* Battery and Info Look: <URL:http://www-cdf.fnal.gov/~sthrlnd/emacs/>
* BibTeX:
<URL:http://www.ida.ing.tu-bs.de/people/dirk/bibtex/index.html>
@ -69,7 +69,7 @@ You might find bug-fixes or enhancements in these places.
* Hideshow: <URL:http://www.glug.org/people/ttn/software/hideshow/>
* Ispell: <URL:http://www.kdstevens.com/%7Estevens/ispell-page.html>
* Ispell: <URL:http://www.eng.utah.edu/~kstevens/ispell-page.html>
* PC Selection: <URL:ftp://ftp.thp.uni-duisburg.de/pub/source/elisp/>
@ -99,7 +99,7 @@ You might find bug-fixes or enhancements in these places.
* Scheme: <URL:ftp://ftp-swiss.ai.mit.edu/pub/scm/r5rs.info.tar.gz>
* LaTeX: <URL:ftp://ctan.tug.org/tex-archive/info/latex2e-help-texinfo/
latex2e.texi> (or CTAN mirrors)
* Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/perl5/>
* Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/>
(or CPAN mirrors)
* Packages and add-ons not bundled with Emacs
@ -170,7 +170,7 @@ Several are for Debian GNU/Linux in particular.
<URL:http://www.emacswiki.org/cgi-bin/wiki?EmacsIRCClient>
* Gnuserv:
<URL:http://meltin.net/hacks/emacs/>
<URL:http://www.hpl.hp.com/personal/ange/gnuserv/home.html>
Enhanced emacsclient/emacsserver. Also available from this Web
page: eiffel-mode.el.
@ -180,11 +180,11 @@ Several are for Debian GNU/Linux in particular.
<URL:http://www.gnu.org/software/gnugo/gnugo.html>
* hm--html-menus:
<URL:ftp://ftp.tnt.uni-hannover.de/pub/editors/xemacs/contrib>
<URL:ftp://sunsite.unc.edu/pub/Linux/apps/editors/emacs/>
HTML-specific editing. Can work with PSGML.
* Hyperbole:
<URL:http://ftp.gnu.org/pub/gnu/hyperbole/hyperbole-4.01.tar.gz>
<URL:http://ftp.gnu.org/pub/gnu/hyperbole/>
Hyperbole is an open, efficient, programmable information
management and hypertext system.
@ -242,20 +242,19 @@ Several are for Debian GNU/Linux in particular.
* VM (View Mail): <URL:http://www.wonderworks.com/vm/> Alternative
mail reader. There is a VM newsgroup: <URL:news:gnu.emacs.vm.info>
* W3: <URL:http://www.cs.indiana.edu/elisp/w3/docs.html>
* W3: <URL:http://savannah.gnu.org/projects/w3/>
Web browser. There's a W3 mail list/newsgroup
<URL:news://sunsite.auc.dk/emacs.w3> and a W3 development mail
list/newsgroup <URL:news://sunsite.auc.dk/emacs.w3.dev>.
<URL:http://savannah.gnu.org/mail/?group=w3>.
* Wanderlust: <URL:http://www.gohome.org/wl/>
Yet Another Message Interface on Emacsen. Wanderlust is a mail/news
reader supporting IMAP4rev1 for emacsen.
* WhizzyTex: <URL:http://pauillac.inria.fr/whizzytex/>
* WhizzyTex: <URL:http://cristal.inria.fr/whizzytex/>
WhizzyTeX provides a minor mode for Emacs or XEmacs, a (bash)
shell-script daemon and some LaTeX macros.
* X-Symbol: <URL:http://x-symbol.sf.net/>
* X-Symbol: <URL:http://x-symbol.sourceforge.net/>
Quasi-WYSIWYG editing of TeX & al. (It will be improved to take
better advantage of Emacs 21 features.)

View file

@ -1,3 +1,8 @@
2006-03-30 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el (mac-system-coding-system): Define and use after
Mac-specific coding systems are ready.
2006-03-27 Romain Francoise <romain@orebokech.com>
* net/rcirc.el (rcirc-connect): Add autoload cookie.

View file

@ -1,3 +1,90 @@
2006-03-30 Bill Wohler <wohler@newt.com>
* mh-e.el (mh-defcustom, mh-defface, mh-defgroup): Macros to
remove new :package-version keyword in older settings.
(customize-package-emacs-version-alist): Add MH-E version to Emacs
version mappings.
(mh-e, mh-alias, mh-folder, mh-folder-selection)
(mh-identity, mh-inc, mh-junk, mh-letter, mh-ranges)
(mh-scan-line-formats, mh-search, mh-sending-mail)
(mh-sequences, mh-show, mh-speedbar, mh-thread, mh-tool-bar)
(mh-hooks, mh-faces): Add :package-version keyword to these
groups.
(mh-alias-completion-ignore-case-flag)
(mh-alias-expand-aliases-flag, mh-alias-flash-on-comma)
(mh-alias-insert-file, mh-alias-insertion-location)
(mh-alias-local-users, mh-alias-local-users-prefix)
(mh-alias-passwd-gecos-comma-separator-flag)
(mh-new-messages-folders, mh-ticked-messages-folders)
(mh-large-folder, mh-recenter-summary-flag)
(mh-recursive-folders-flag, mh-sortm-args)
(mh-default-folder-for-message-function)
(mh-default-folder-list, mh-default-folder-must-exist-flag)
(mh-default-folder-prefix, mh-identity-list)
(mh-auto-fields-list, mh-auto-fields-prompt-flag)
(mh-identity-default, mh-identity-handlers, mh-inc-prog)
(mh-inc-spool-list, mh-junk-background, mh-junk-disposition)
(mh-junk-program, mh-compose-insertion)
(mh-compose-skipped-header-fields)
(mh-compose-space-does-completion-flag)
(mh-delete-yanked-msg-window-flag)
(mh-extract-from-attribution-verb, mh-ins-buf-prefix)
(mh-letter-complete-function, mh-letter-fill-column)
(mh-mml-method-default, mh-signature-file-name)
(mh-signature-separator-flag, mh-x-face-file)
(mh-yank-behavior, mh-interpret-number-as-range-flag)
(mh-adaptive-cmd-note-flag, mh-scan-format-file, mh-scan-prog)
(mh-search-program, mh-compose-forward-as-mime-flag)
(mh-compose-letter-function, mh-compose-prompt-flag)
(mh-forward-subject-format, mh-insert-x-mailer-flag)
(mh-redist-full-contents-flag, mh-reply-default-reply-to)
(mh-reply-show-message-flag)
(mh-refile-preserves-sequences-flag, mh-tick-seq)
(mh-update-sequences-after-mh-show-flag)
(mh-bury-show-buffer-flag, mh-clean-message-header-flag)
(mh-decode-mime-flag)
(mh-display-buttons-for-alternatives-flag)
(mh-display-buttons-for-inline-parts-flag)
(mh-do-not-confirm-flag, mh-fetch-x-image-url)
(mh-graphical-smileys-flag, mh-graphical-emphasis-flag)
(mh-highlight-citation-style, mh-invisible-header-fields)
(mh-invisible-header-fields-default, mh-lpr-command-format)
(mh-max-inline-image-height, mh-max-inline-image-width)
(mh-mhl-format-file, mh-mime-save-parts-default-directory)
(mh-print-background-flag, mh-show-maximum-size)
(mh-show-use-xface-flag, mh-store-default-directory)
(mh-summary-height, mh-speed-update-interval)
(mh-show-threads-flag, mh-tool-bar-search-function): Add
:package-version keyword to these options.
(mh-after-commands-processed-hook)
(mh-alias-reloaded-hook, mh-before-commands-processed-hook)
(mh-before-quit-hook, mh-before-send-letter-hook)
(mh-delete-msg-hook, mh-find-path-hook, mh-folder-mode-hook)
(mh-forward-hook, mh-inc-folder-hook)
(mh-insert-signature-hook)
(mh-kill-folder-suppress-prompt-hooks, mh-letter-mode-hook)
(mh-mh-to-mime-hook, mh-search-mode-hook, mh-quit-hook)
(mh-refile-msg-hook, mh-show-hook, mh-show-mode-hook)
(mh-unseen-updated-hook): Add :package-version keyword to these
hooks.
(mh-min-colors-defined-flag)
(mh-folder-address, mh-folder-body, mh-folder-cur-msg-number)
(mh-folder-date, mh-folder-deleted, mh-folder-followup)
(mh-folder-msg-number, mh-folder-refiled)
(mh-folder-sent-to-me-hint, mh-folder-sent-to-me-sender)
(mh-folder-subject, mh-folder-tick, mh-folder-to)
(mh-letter-header-field, mh-search-folder, mh-show-cc)
(mh-show-date, mh-show-from, mh-show-header, mh-show-pgg-bad)
(mh-show-pgg-good, mh-show-pgg-unknown, mh-show-signature)
(mh-show-subject, mh-show-to, mh-show-xface)
(mh-speedbar-folder, mh-speedbar-folder-with-unseen-messages)
(mh-speedbar-selected-folder)
(mh-speedbar-selected-folder-with-unseen-messages): : Add
:package-version keyword to these faces.
* mh-tool-bar.el (mh-tool-bar-define): Added commented-out
:package-version keywords.
2006-03-28 Bill Wohler <wohler@newt.com>
* mh-tool-bar.el: Use clipboard-kill-region,

File diff suppressed because it is too large Load diff

View file

@ -321,7 +321,9 @@ where,
:group 'mh-tool-bar :set 'mh-tool-bar-folder-buttons-set
:type '(set ,@(loop for x in folder-buttons
for y in folder-docs
collect `(const :tag ,y ,x))))
collect `(const :tag ,y ,x)))
;;:package-version '(MH-E "7.1")
)
(custom-declare-variable
'mh-tool-bar-letter-buttons
'(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults))
@ -329,7 +331,9 @@ where,
:group 'mh-tool-bar :set 'mh-tool-bar-letter-buttons-set
:type '(set ,@(loop for x in letter-buttons
for y in letter-docs
collect `(const :tag ,y ,x)))))))
collect `(const :tag ,y ,x)))
;;:package-version '(MH-E "7.1")
))))
(mh-tool-bar-define
((:folder mh-inc-folder mh-mime-save-parts

View file

@ -1103,15 +1103,6 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
)
"Alist of Mac script codes vs Emacs coding systems.")
(defconst mac-system-coding-system
(let ((base (or (cdr (assq mac-system-script-code
mac-script-code-coding-systems))
'mac-roman)))
(if (eq system-type 'darwin)
base
(coding-system-change-eol-conversion base 'mac)))
"Coding system derived from the system script code.")
(defun mac-add-charset-info (xlfd-charset mac-text-encoding)
"Add a character set to display with Mac fonts.
Create an entry in `mac-charset-info-alist'.
@ -1153,9 +1144,6 @@ correspoinding TextEncodingBase value."
;;;; Selections
;; Setup to use the Mac clipboard.
(set-selection-coding-system mac-system-coding-system)
;;; We keep track of the last text selected here, so we can check the
;;; current selection against it, and avoid passing back our own text
;;; from x-get-selection-value.
@ -1896,6 +1884,17 @@ It returns a name of the created fontset."
;; Enable CLIPBOARD copy/paste through menu bar commands.
(menu-bar-enable-clipboard)
(defconst mac-system-coding-system
(let ((base (or (cdr (assq mac-system-script-code
mac-script-code-coding-systems))
'mac-roman)))
(if (eq system-type 'darwin)
base
(coding-system-change-eol-conversion base 'mac)))
"Coding system derived from the system script code.")
(set-selection-coding-system mac-system-coding-system)
(defun mac-drag-n-drop (event)
"Edit the files listed in the drag-n-drop EVENT.
Switch to a buffer editing the last file dropped."

View file

@ -1,3 +1,8 @@
2006-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
* url-handlers.el (url-handler-directory-file-name): New handler.
(url-file-local-copy): Plug race condition security hole.
2006-03-27 Romain Francoise <romain@orebokech.com>
* url-irc.el (url-irc-rcirc, url-irc-erc): New functions.

View file

@ -151,6 +151,8 @@ the arguments that would have been passed to OPERATION."
(put 'substitute-in-file-name 'url-file-handlers 'url-file-handler-identity)
(put 'file-name-absolute-p 'url-file-handlers (lambda (&rest ignored) t))
(put 'expand-file-name 'url-file-handlers 'url-handler-expand-file-name)
(put 'directory-file-name 'url-file-handlers 'url-handler-directory-file-name)
;; (put 'file-name-as-directory 'url-file-handlers 'url-handler-file-name-as-directory)
;; These are operations that we do not support yet (DAV!!!)
(put 'file-writable-p 'url-file-handlers 'ignore)
@ -160,10 +162,27 @@ the arguments that would have been passed to OPERATION."
(put 'vc-registered 'url-file-handlers 'ignore)
(defun url-handler-expand-file-name (file &optional base)
;; When we see "/foo/bar" in a file whose working dir is "http://bla/bla",
;; there are two interpretations possible: either it's a local "/foo/bar"
;; or it's "http:/bla/foo/bar". When working with URLs, the second
;; interpretation is the right one, but when working with Emacs file
;; names, the first is preferred.
(if (file-name-absolute-p file)
(expand-file-name file "/")
(url-expand-file-name file base)))
;; directory-file-name and file-name-as-directory are kind of hard to
;; implement really right for URLs since URLs can have repeated / chars.
;; We'd want the following behavior:
;; idempotence: (d-f-n (d-f-n X) == (d-f-n X)
;; idempotence: (f-n-a-d (f-n-a-d X) == (f-n-a-d X)
;; reversible: (d-f-n (f-n-a-d (d-f-n X))) == (d-f-n X)
;; reversible: (f-n-a-d (d-f-n (f-n-a-d X))) == (f-n-a-d X)
(defun url-handler-directory-file-name (dir)
;; When there's more than a single /, just don't touch the slashes at all.
(if (string-match "//\\'" dir) dir
(url-run-real-handler 'directory-file-name (list dir))))
;; The actual implementation
;;;###autoload
(defun url-copy-file (url newname &optional ok-if-already-exists keep-time)
@ -193,7 +212,7 @@ A prefix arg makes KEEP-TIME non-nil."
"Copy URL into a temporary file on this machine.
Returns the name of the local copy, or nil, if FILE is directly
accessible."
(let ((filename (make-temp-name "url")))
(let ((filename (make-temp-file "url")))
(url-copy-file url filename)
filename))

View file

@ -1,3 +1,10 @@
2006-03-29 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Top): Add comment about version line.
* message.texi (Top): Ditto. Change to take named versions into
account.
2006-03-28 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Posting Styles): Add x-face-file to example.

View file

@ -49,6 +49,7 @@ license to the document, as described in section 6 of the license.
\makeindex
\begin{document}
% Adjust ../Makefile.in if you change the following line:
\newcommand{\gnusversionname}{Gnus v5.10.6}
\newcommand{\gnuschaptername}{}
\newcommand{\gnussectionname}{}
@ -358,6 +359,7 @@ can be gotten by any nefarious means you can think of---@acronym{NNTP}, local
spool or your mbox file. All at the same time, if you want to push your
luck.
@c Adjust ../Makefile.in if you change the following line:
This manual corresponds to Gnus v5.10.6.
@end ifinfo

View file

@ -67,9 +67,10 @@ Message mode buffers.
* Key Index:: List of Message mode keys.
@end menu
This manual corresponds to Message v5.10.6. Message is distributed
with the Gnus distribution bearing the same version number as this
manual.
@c Adjust ../Makefile.in if you change the following lines:
Message is distributed with Gnus. The Gnus distribution
@c
corresponding to this manual is Gnus v5.10.6.
@node Interface

View file

@ -1,3 +1,24 @@
2006-03-31 Kenichi Handa <handa@m17n.org>
* xfns.c (xg_set_icon): Delete superfluous UNGCPRO.
2006-03-30 Dan Nicolaescu <dann@ics.uci.edu>
* xdisp.c (syms_of_xdisp): Fix variable name.
2006-03-30 Kenichi Handa <handa@m17n.org>
* xterm.c (x_term_init): Delete superfluous UNGCPRO.
2006-03-29 Juanma Barranquero <lekktu@gmail.com>
* keyboard.c (process_tool_bar_item): Reorder dummy args.
2006-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (tool_bar_items): Use map_keymap.
(process_tool_bar_item): Add dummy args to fit the required interface.
2006-03-25 Eli Zaretskii <eliz@gnu.org>
* .gdbinit (pr, pp, pp1, pv, pv1): Force print_output_debug_flag
@ -13,8 +34,7 @@
(Fdecode_time, Fencode_time): Use TM_YEAR_BASE instead of 1900.
(Fdecode_time): Cast tm_year to EMACS_INT.
(Fcurrent_time_string): Report an invalid time specification if
the argument is invalid. Also, check for out-of-range time
stamps.
the argument is invalid. Also, check for out-of-range time stamps.
2006-03-24 Kim F. Storm <storm@cua.dk>
@ -54,8 +74,8 @@
2006-03-21 Ken Raeburn <raeburn@raeburn.org>
* xdisp.c (store_next_glyph): Renamed from append_glyph.
(generate_stretch_glyph): Renamed from produce_stretch_glyph.
* xdisp.c (store_next_glyph): Rename from append_glyph.
(generate_stretch_glyph): Rename from produce_stretch_glyph.
All callers changed accordingly.
2006-03-21 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
@ -896,8 +916,8 @@
* editfns.c (Fconstrain_to_field): Fix behaviour on field boundaries.
(find_field): Set before_field to after_field when pos is at BEGV.
(Fline_beginning_position, Fline_end_position): Clarify
confusing doc string.
(Fline_beginning_position, Fline_end_position):
Clarify confusing doc string.
* cmds.c (Fbeginning_of_line, Fend_of_line): Clarify confusing doc
string.
@ -1826,7 +1846,7 @@
2005-11-11 David Reitter <david.reitter@gmail.com>
* macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
Vmac_control_modifier / mac-control-modifier,
Vmac_option_modifier / mac-option-modifier,
Vmac_command_modifier / mac-command-modifier.

View file

@ -7581,7 +7581,7 @@ Lisp_Object QCimage;
/* Function prototypes. */
static void init_tool_bar_items P_ ((Lisp_Object));
static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*));
static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
static void append_tool_bar_item P_ ((void));
@ -7659,17 +7659,7 @@ tool_bar_items (reuse, nitems)
keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
if (CONSP (keymap))
{
Lisp_Object tail;
/* KEYMAP is a list `(keymap (KEY . BINDING) ...)'. */
for (tail = keymap; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object keydef = XCAR (tail);
if (CONSP (keydef))
process_tool_bar_item (XCAR (keydef), XCDR (keydef));
}
}
map_keymap (keymap, process_tool_bar_item, Qnil, NULL, 1);
}
Vinhibit_quit = oquit;
@ -7681,8 +7671,9 @@ tool_bar_items (reuse, nitems)
/* Process the definition of KEY which is DEF. */
static void
process_tool_bar_item (key, def)
Lisp_Object key, def;
process_tool_bar_item (key, def, data, args)
Lisp_Object key, def, data;
void *args;
{
int i;
extern Lisp_Object Qundefined;

View file

@ -23975,7 +23975,7 @@ before automatic hscrolling will horizontally scroll the window. */);
DEFVAR_LISP ("hscroll-step", &Vhscroll_step,
doc: /* *How many columns to scroll the window when point gets too close to the edge.
When point is less than `automatic-hscroll-margin' columns from the window
When point is less than `hscroll-margin' columns from the window
edge, automatic hscrolling will scroll the window by the amount of columns
determined by this variable. If its value is a positive integer, scroll that
many columns. If it's a positive floating-point number, it specifies the

View file

@ -817,7 +817,6 @@ xg_set_icon (f, file)
UNBLOCK_INPUT;
}
UNGCPRO;
return result;
}

View file

@ -10441,8 +10441,6 @@ x_term_init (display_name, xrm_option, resource_name)
if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file)))
gtk_rc_parse (SDATA (abs_file));
UNGCPRO;
}
XSetErrorHandler (x_error_handler);