Mercurial > emacs
changeset 108961:cc3c27fdb5e5
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 10 Jun 2010 05:30:32 +0000 |
| parents | 234c5347118d (current diff) 57d9635c33fb (diff) |
| children | 98ae5d8b7b72 |
| files | |
| diffstat | 10 files changed, 82 insertions(+), 156 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/doc/emacs/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -1,3 +1,8 @@ +2010-06-10 Glenn Morris <rgm@gnu.org> + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Update for notifications.el. + 2010-05-31 Daiki Ueno <ueno@unixuser.org> * dired.texi (Operating on Files): Mention encryption commands
--- a/doc/emacs/ack.texi Thu Jun 10 00:30:13 2010 +0000 +++ b/doc/emacs/ack.texi Thu Jun 10 05:30:32 2010 +0000 @@ -227,6 +227,10 @@ files as ``thumbnails.'' @item +Julien Danjou wrote an implementation of ``Desktop Notifications'' +(@file{notifications.el}). + +@item Vivek Dasmohapatra wrote @file{htmlfontify.el}, to convert a buffer or source tree to HTML.
--- a/doc/emacs/emacs.texi Thu Jun 10 00:30:13 2010 +0000 +++ b/doc/emacs/emacs.texi Thu Jun 10 05:30:32 2010 +0000 @@ -1354,33 +1354,34 @@ Buehler, W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chong Yidong, Chris Chase, Bob Chassell, Andrew Choi, Sacha Chua, James Clark, Mike Clarkson, Glynn Clements, Daniel Colascione, Andrew Csillag, -Baoqiu Cui, Doug Cutting, Mathias Dahl, Satyaki Das, Vivek Dasmohapatra, -Michael DeCorte, Gary Delp, Matthieu Devin, Eri Ding, Jan Dj@"{a}rv, -Carsten Dominik, Scott Draves, Benjamin Drieu, Viktor Dukhovni, Dmitry -Dzhus, John Eaton, Rolf Ebert, Paul Eggert, Stephen Eglen, Torbj@"orn -Einarsson, Tsugutomo Enami, Hans Henrik Eriksen, Michael Ernst, Ata -Etemadi, Frederick Farnbach, Oscar Figueiredo, Fred Fish, Karl Fogel, -Gary Foster, Romain Francoise, Noah Friedman, Andreas Fuchs, Hallvard -Furuseth, Keith Gabryelski, Peter S.@: Galbraith, Kevin Gallagher, Kevin -Gallo, Juan Le@'{o}n Lahoz Garc@'{@dotless{i}}a, Howard Gayle, Daniel -German, Stephen Gildea, Julien Gilles, David Gillespie, Bob Glickstein, -Deepak Goel, Boris Goldowsky, Michelangelo Grigni, Odd Gripenstam, Kai -Gro@ss{}johann, Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug -Gwyn, Ken'ichi Handa, Lars Hansen, Chris Hanson, K. Shane Hartman, John -Heidemann, Jon K.@: Hellan, Jesper Harder, Magnus Henoch, Markus -Heritsch, Karl Heuer, Manabu Higashida, Anders Holst, Jeffrey C.@: -Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim Hove, Denis Howe, -Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Philip Jackson, Pavel -Janik, Paul Jarc, Ulf Jasper, Michael K. Johnson, Kyle Jones, Terry -Jones, Simon Josefsson, Arne J@o{}rgensen, Tomoji Kagatani, Brewster -Kahle, Tokuya Kameshima, Lute Kamstra, David Kastrup, David Kaufman, -Henry Kautz, Taichi Kawabata, Howard Kaye, Michael Kifer, Richard King, -Peter Kleiweg, Karel Kl@'{@dotless{i}}@v{c}, Shuhei Kobayashi, Pavel -Kobiakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki Yoshinori, -Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, David K@aa{}gedal, Daniel -LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, -Vinicius Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, -Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, +Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, +Vivek Dasmohapatra, Michael DeCorte, Gary Delp, Matthieu Devin, Eri +Ding, Jan Dj@"{a}rv, Carsten Dominik, Scott Draves, Benjamin Drieu, +Viktor Dukhovni, Dmitry Dzhus, John Eaton, Rolf Ebert, Paul Eggert, +Stephen Eglen, Torbj@"orn Einarsson, Tsugutomo Enami, Hans Henrik +Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar +Figueiredo, Fred Fish, Karl Fogel, Gary Foster, Romain Francoise, Noah +Friedman, Andreas Fuchs, Hallvard Furuseth, Keith Gabryelski, Peter S.@: +Galbraith, Kevin Gallagher, Kevin Gallo, Juan Le@'{o}n Lahoz +Garc@'{@dotless{i}}a, Howard Gayle, Daniel German, Stephen Gildea, +Julien Gilles, David Gillespie, Bob Glickstein, Deepak Goel, Boris +Goldowsky, Michelangelo Grigni, Odd Gripenstam, Kai Gro@ss{}johann, +Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug Gwyn, Ken'ichi +Handa, Lars Hansen, Chris Hanson, K. Shane Hartman, John Heidemann, Jon +K.@: Hellan, Jesper Harder, Magnus Henoch, Markus Heritsch, Karl Heuer, +Manabu Higashida, Anders Holst, Jeffrey C.@: Honig, Tassilo Horn, Kurt +Hornik, Tom Houlder, Joakim Hove, Denis Howe, Lars Ingebrigtsen, Andrew +Innes, Seiichiro Inoue, Philip Jackson, Pavel Janik, Paul Jarc, Ulf +Jasper, Michael K. Johnson, Kyle Jones, Terry Jones, Simon Josefsson, +Arne J@o{}rgensen, Tomoji Kagatani, Brewster Kahle, Tokuya Kameshima, +Lute Kamstra, David Kastrup, David Kaufman, Henry Kautz, Taichi +Kawabata, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel +Kl@'{@dotless{i}}@v{c}, Shuhei Kobayashi, Pavel Kobiakov, Larry K.@: +Kolodney, David M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, +Sebastian Kremer, Ryszard Kubiak, David K@aa{}gedal, Daniel LaLiberte, +Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius +Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Lars +Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, Francis Litterio, Emilio C. Lopes, K@'{a}roly L@H{o}rentey, Dave Love, Sascha L@"{u}decke, Eric Ludlam, Alan Mackenzie, Christopher J.@: Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon
--- a/doc/misc/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/doc/misc/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -2317,10 +2317,6 @@ * gnus-news.texi, gnus-coding.texi, sasl.texi: New files. -2007-10-28 Emanuele Giaquinta <e.giaquinta@glauco.it> (tiny change) - - * gnus-faq.texi ([5.12]): Remove reference to discontinued service. - 2007-10-28 Reiner Steib <Reiner.Steib@gmx.de> * gnus.texi (Sorting the Summary Buffer): Remove @@ -3856,19 +3852,6 @@ * org.texi (Progress logging): New section. -2006-05-29 Stefan Monnier <monnier@iro.umontreal.ca> - - * viper.texi (Viper Specials): - * gnus.texi (Example Setup): - * faq.texi (Backspace invokes help): - * dired-x.texi (Optional Installation Dired Jump): - * calc.texi (Defining Simple Commands): Use ;; instead of ;;; to better - follow coding conventions. - -2006-05-18 Reiner Steib <Reiner.Steib@gmx.de> - - * gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail. - 2006-06-06 Carsten Dominik <dominik@science.uva.nl> * org.texi (ASCII export): Document indentation adaptation. @@ -3916,6 +3899,15 @@ * org.texi: Small typo fixes. +2006-05-29 Stefan Monnier <monnier@iro.umontreal.ca> + + * viper.texi (Viper Specials): + * gnus.texi (Example Setup): + * faq.texi (Backspace invokes help): + * dired-x.texi (Optional Installation Dired Jump): + * calc.texi (Defining Simple Commands): Use ;; instead of ;;; to better + follow coding conventions. + 2006-05-29 Michael Albinus <michael.albinus@gmx.de> * tramp.texi (Frequently Asked Questions): Disable zsh zle. @@ -4472,10 +4464,6 @@ * gnus.texi (Article Washing): Additions. -2006-01-08 Alex Schroeder <alex@gnu.org> - - * pgg.texi (Caching passphrase): Rewording. - 2006-01-13 Carsten Dominik <dominik@science.uva.nl> * org.texi (Agenda commands): Document tags command.
--- a/lib-src/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/lib-src/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -47,11 +47,6 @@ * Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp. -2010-05-08 Christoph <cschol2112@googlemail.com> (tiny change) - - * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis - for macros for nmake compatibility. - 2010-05-08 Glenn Morris <rgm@gnu.org> * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. @@ -4578,16 +4573,6 @@ * Makefile.in.in (install, maybe-blessmail): Don't cd ..; configure has already set $(INSTALL) to the proper relative path. -1995-06-27 Francesco Potortì (pot@cnuce.cnr.it) - - * etags.c (plain_C_entries): New function. - (lowcase): New macro. - (tail, Fortran_functions, Pascal_functions): Use new macro lowcase. - (lang_suffixes): New suffix ".pc" for Pro*C files. - (consider_token): Don't tag all tokens beginning with DEFUN & Co.. - (tail): Look for the end of the token when comparing. - (takeprec): Since now tail behaves differently, use strneq. - 1995-07-08 Paul Eggert <eggert@twinsun.com> * rcs2log (datearg): Separate date from time with comma, not space,
--- a/lisp/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/lisp/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -1,3 +1,8 @@ +2010-06-10 Stefan Monnier <monnier@iro.umontreal.ca> + + * net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve + merge conflict, giving preference to the emacs-23 version of the code. + 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/advice.el (ad-compile-function): @@ -330,15 +335,6 @@ (server-create-window-system-frame): New arg. Pass parent-id as frame parameter. -2010-05-29 Chong Yidong <cyd@stupidchicken.com> - - * ansi-color.el: Delete unused escape sequences (Bug#6085). - (ansi-color-drop-regexp): New constant. - (ansi-color-apply, ansi-color-filter-region) - (ansi-color-apply-on-region): Delete unrecognized control - sequences. - (ansi-color-apply): Build string list before calling concat. - 2010-05-29 Eli Zaretskii <eliz@gnu.org> Bidi-sensitive word movement with arrow keys. @@ -487,11 +483,6 @@ * progmodes/verilog-mode.el (verilog-type-font-keywords): Use font-lock-constant-face, not obsolete font-lock-reference-face. -2010-05-27 Masatake YAMATO <yamato@redhat.com> - - * htmlfontify.el (hfy-face-resolve-face): New function. - (hfy-face-to-style): Use it (Bug#6279). - 2010-05-27 Kenichi Handa <handa@m17n.org> * language/hebrew.el (hebrew-shape-gstring): Check if a glyph @@ -585,11 +576,15 @@ 2010-05-25 Ryan Yeske <rcyeske@gmail.com> - * net/rcirc.el (rcirc-server-alist): Add :pass. - (rcirc-default-user-name): Change to "user". + * net/rcirc.el (rcirc-default-user-name): Change to "user". (rcirc-default-full-name): Change to "unknown". (rcirc-user-name-history): Add variable. - (rcirc): When prompting for connection paramaters, also prompt for + +2010-05-25 Ryan Yeske <rcyeske@gmail.com> + Jonathan Rockway <jon@jrock.us> + + * net/rcirc.el (rcirc-server-alist): Add :pass. + (rcirc): When prompting for connection parameters, also prompt for username and password. (rcirc-connect): Take a PASS argument. If PASS is non-nil, send value to server when connecting. @@ -633,11 +628,6 @@ * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201). -2010-05-24 Stefan Monnier <monnier@iro.umontreal.ca> - - * subr.el (read-quoted-char): Resolve modifiers after key - remapping (bug#6212). - 2010-05-22 Chong Yidong <cyd@stupidchicken.com> * image.el (image-refresh): Define as an alias for image-flush. @@ -1544,11 +1534,6 @@ * minibuffer.el (tags-completion-at-point-function): Fix return value. -2010-04-30 Eli Zaretskii <eliz@gnu.org> - - * composite.el (compose-region, reference-point-alist): Fix typos - in the doc strings. - 2010-04-29 Chong Yidong <cyd@stupidchicken.com> * ido.el (ido-init-completion-maps): Remove C-v binding.
--- a/lisp/net/rcirc.el Thu Jun 10 00:30:13 2010 +0000 +++ b/lisp/net/rcirc.el Thu Jun 10 05:30:32 2010 +0000 @@ -81,15 +81,16 @@ VALUE must be a string. If absent, `rcirc-default-user-name' is used. +`:password' + +VALUE must be a string. If absent, no PASS command will be sent +to the server. + `:full-name' VALUE must be a string. If absent, `rcirc-default-full-name' is used. -`:pass' - -VALUE must be a string. - `:channels' VALUE must be a list of strings describing which channels to join @@ -99,8 +100,8 @@ :value-type (plist :options ((:nick string) (:port integer) (:user-name string) + (:password string) (:full-name string) - (:pass string) (:channels (repeat string))))) :group 'rcirc) @@ -406,8 +407,8 @@ (or (plist-get server-plist :user-name) rcirc-default-user-name) 'rcirc-user-name-history)) - (pass (read-passwd "IRC Password: " nil - (plist-get server-plist :pass))) + (password (read-passwd "IRC Password: " nil + (plist-get server-plist :password))) (channels (split-string (read-string "IRC Channels: " (mapconcat 'identity @@ -415,9 +416,9 @@ :channels) " ")) "[, ]+" t))) - (rcirc-connect server port nick user-name pass + (rcirc-connect server port nick user-name rcirc-default-full-name - channels)) + channels password)) ;; connect to servers in `rcirc-server-alist' (let (connected-servers) (dolist (c rcirc-server-alist) @@ -426,10 +427,10 @@ (port (or (plist-get (cdr c) :port) rcirc-default-port)) (user-name (or (plist-get (cdr c) :user-name) rcirc-default-user-name)) - (pass (plist-get (cdr c) :pass)) (full-name (or (plist-get (cdr c) :full-name) rcirc-default-full-name)) - (channels (plist-get (cdr c) :channels))) + (channels (plist-get (cdr c) :channels)) + (password (plist-get (cdr c) :password))) (when server (let (connected) (dolist (p (rcirc-process-list)) @@ -437,8 +438,8 @@ (setq connected p))) (if (not connected) (condition-case e - (rcirc-connect server port nick user-name pass - full-name channels) + (rcirc-connect server port nick user-name + full-name channels password) (quit (message "Quit connecting to %s" server))) (with-current-buffer (process-buffer connected) (setq connected-servers @@ -469,8 +470,8 @@ (defvar rcirc-process nil) ;;;###autoload -(defun rcirc-connect (server &optional port nick user-name pass - full-name startup-channels) +(defun rcirc-connect (server &optional port nick user-name + full-name startup-channels password) (save-excursion (message "Connecting to %s..." server) (let* ((inhibit-eol-conversion) @@ -519,8 +520,8 @@ (add-hook 'auto-save-hook 'rcirc-log-write) ;; identify - (when pass - (rcirc-send-string process (concat "PASS " pass))) + (when password + (rcirc-send-string process (concat "PASS " password))) (rcirc-send-string process (concat "NICK " nick)) (rcirc-send-string process (concat "USER " user-name " 0 * :" full-name))
--- a/lwlib/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/lwlib/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -891,11 +891,6 @@ [USE_XAW]: Include <X11/Xaw/Paned.h>. (lwlib_memset, lwlib_bcopy): Explicitly declare return type. -1997-12-20 Richard Stallman <rms@delysid.gnu.org> - - * lwlib-Xm.c (update_one_menu_entry): - Add conditional in case XmNpositionIndex is missing. - 1997-12-20 Richard Stallman <rms@psilocin.gnu.org> * lwlib-Xm.c (update_one_menu_entry): @@ -1176,12 +1171,6 @@ cascade button itself. This works around a Motif SIGSEGV in the function `InSharedMenuHierarchy'. -1994-10-29 Richard Stallman <rms@duality.gnu.ai.mit.edu> - - * xlwmenu.c (xlwmenu_default_font): New global variable. - (XlwMenuInitialize): Use xlwmenu_default_font to default - the font if necessary. Make mw, itself, an argument. - 1994-10-26 Richard Stallman <rms@duality.gnu.ai.mit.edu> * xlwmenu.c (pop_up_menu): Pass a Display * to x_catch_errors, etc.
--- a/src/ChangeLog Thu Jun 10 00:30:13 2010 +0000 +++ b/src/ChangeLog Thu Jun 10 05:30:32 2010 +0000 @@ -1,3 +1,7 @@ +2010-06-10 Glenn Morris <rgm@gnu.org> + + * m/ibms390x.h: Rather than duplicating ibms390.h, just include it. + 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. @@ -1942,11 +1946,6 @@ (gif_load): Put GIF extension data to the property `Qextension_data'. -2010-04-05 Chong Yidong <cyd@stupidchicken.com> - - * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for - terminal frames (Bug#5837). - 2010-03-31 Chong Yidong <cyd@stupidchicken.com> * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. @@ -2188,11 +2187,6 @@ case that the output buffer is fullfilled. (encode_coding): Setup ccl program here. -2010-03-24 Andreas Politz <politza@fh-trier.de> (tiny change) - - * editfns.c (Fformat): Account for string precision when computing - field width (Bug#5710). - 2010-03-23 Dan Nicolaescu <dann@ics.uci.edu> * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default. @@ -14023,12 +14017,6 @@ Report an error when image size is invalid. Read two bytes at a time when raw images have max_color_idx above 255. -2008-04-05 Eli Zaretskii <eliz@gnu.org> - - * w32.c (readdir): If FindFirstFile/FindNextFile return in - cFileName a file name that includes `?' characters, use the 8+3 - alias in cAlternateFileName instead. - 2008-04-05 Kenichi Handa <handa@ni.aist.go.jp> * ccl.c (ccl_driver): If ccl->quit_silently is nonzero, don't
--- a/src/m/ibms390x.h Thu Jun 10 00:30:13 2010 +0000 +++ b/src/m/ibms390x.h Thu Jun 10 05:30:32 2010 +0000 @@ -1,4 +1,4 @@ -/* machine description file for IBM S390 in 64-bit mode +/* Machine description file for IBM S390 in 64-bit mode Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. @@ -18,17 +18,11 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* This file was made by copying the significant parts of amdx86-64.h - into ibms390.h. */ +#include "ibms390.h" -/* Used for machine IBM s390 64 bits with opsys gnu-linux. */ #define BITS_PER_LONG 64 #define BITS_PER_EMACS_INT 64 -/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word - is the most significant byte. */ -#define WORDS_BIG_ENDIAN - /* Define the type to use. */ #define EMACS_INT long #define EMACS_UINT unsigned long @@ -40,20 +34,6 @@ This flag only matters if you use USE_LISP_UNION_TYPE. */ #undef EXPLICIT_SIGN_EXTEND -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ -#define VIRT_ADDR_VARIES - /* On the 64 bit architecture, we can use 60 bits for addresses */ #define VALBITS 60