Commit 948b98fd authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents 7a7ef429 11fdef7d
......@@ -68,10 +68,12 @@ etc.) before "make bootstrap" or "make"; the rest of the procedure is
applicable to those systems as well.
Because the Bazaar version of Emacs is a work in progress, it will
sometimes fail to build. Please wait a day or so (and check the bug
and development mailing list archives) before reporting such problems.
In most cases, the problem is known about and is just waiting for
someone to fix it.
sometimes fail to build. Please wait a day or so (and check the
archives of the emacs-buildstatus, emacs-devel, and bug-gnu-emacs
mailing lists) before reporting such problems. In most cases, the
problem is known about and is just waiting for someone to fix it.
This is especially true for Lisp compilation errors, which are almost
never platform-specific.
2011-06-25 Andreas Rottmann <>
* misc.texi (emacsclient Options): Mention --frame-parameters.
2011-06-09 Glenn Morris <>
* custom.texi (Specifying File Variables):
......@@ -1623,6 +1623,11 @@ text-only terminal frame (@pxref{Frames}). If you omit a filename
argument while supplying the @samp{-c} option, the new frame displays
the @samp{*scratch*} buffer (@pxref{Buffers}).
@item -F
@itemx --frame-parameters=@var{alist}
Set the parameters for a newly-created graphical frame
(@pxref{Frame Parameters}).
@item -d @var{display}
@itemx --display=@var{display}
Tell Emacs to open the given files on the X display @var{display}
2011-06-25 Chong Yidong <>
* keymaps.texi (Searching Keymaps):
* display.texi (Overlay Properties): Fix errors in 2011-05-29
change. Suggested by Johan Bockgård.
2011-06-15 Chong Yidong <>
* text.texi (Special Properties): Clarify role of font-lock-face.
......@@ -1441,9 +1441,9 @@ specify a particular attribute for certain text. @xref{Face
A cons cell, either of the form @code{(fg-color . @var{color-name})}
or @code{(bg-color . @var{color-name})}. These elements specify just
the foreground color or just the background color.
A cons cell, of the form @code{(foreground-color . @var{color-name})}
or @code{(background-color . @var{color-name})}. These elements
specify just the foreground color or just the background color.
@code{(foreground-color . @var{color-name})} has the same effect as
@code{(:foreground @var{color-name})}; likewise for the background.
......@@ -723,13 +723,13 @@ them:
(@var{find-in} overriding-terminal-local-map))
(@var{find-in} overriding-local-map))
(or (@var{find-in} (get-char-property (point) 'keymap))
(@var{find-in-any} emulation-mode-map-alists)
(@var{find-in-any} minor-mode-overriding-map-alist)
(@var{find-in-any} minor-mode-map-alist)
(if (get-text-property (point) 'local-map)
(@var{find-in} (get-char-property (point) 'local-map))
(@var{find-in} (current-local-map)))))
((or (@var{find-in} (get-char-property (point) 'keymap))
(@var{find-in-any} emulation-mode-map-alists)
(@var{find-in-any} minor-mode-overriding-map-alist)
(@var{find-in-any} minor-mode-map-alist)
(if (get-text-property (point) 'local-map)
(@var{find-in} (get-char-property (point) 'local-map))
(@var{find-in} (current-local-map))))))
(@var{find-in} (current-global-map)))
@end lisp
2011-06-25 Andreas Rottmann <>
* emacsclient.1: Mention --frame-parameters.
2011-03-07 Chong Yidong <>
* Version 23.3 released.
......@@ -58,6 +58,9 @@ daemon mode and emacsclient will try to connect to it.
.B -c, \-\-create-frame
create a new frame instead of trying to use the current Emacs frame
.B \-F, \-\-frame-parameters=ALIST
set the parameters of a newly-created frame.
.B \-d, \-\-display=DISPLAY
tell the server to display the files on the given display.
......@@ -84,6 +84,10 @@ client frame in parent X window ID, via XEmbed. This works like the
*** New emacsclient argument -q/--quiet suppresses some status messages.
*** New emacsclient argument --frame-parameters can be used to set the
frame parameters of a newly-created graphical frame.
*** If emacsclient shuts down as a result of Emacs signalling an
error, its exit status is 1.
2011-06-25 Glenn Morris <>
* emacsclient.c (decode_options) <opt>: Add `F:'.
(print_help_and_exit): Mention --frame-parameters.
2011-06-25 Andreas Rottmann <>
* emacsclient.c (longopts, decode_options, main): Add frame-parameters.
2011-06-10 Paul Eggert <>
* movemail.c: Fix race condition and related bugs (Bug#8836).
......@@ -160,6 +160,10 @@ const char *server_file = NULL;
/* PID of the Emacs server process. */
int emacs_pid = 0;
/* If non-NULL, a string that should form a frame parameter alist to
be used for the new frame */
const char *frame_parameters = NULL;
static void print_help_and_exit (void) NO_RETURN;
static void fail (void) NO_RETURN;
......@@ -175,6 +179,7 @@ struct option longopts[] =
{ "nw", no_argument, NULL, 't' },
{ "create-frame", no_argument, NULL, 'c' },
{ "alternate-editor", required_argument, NULL, 'a' },
{ "frame-parameters", required_argument, NULL, 'F' },
{ "socket-name", required_argument, NULL, 's' },
......@@ -526,9 +531,9 @@ decode_options (int argc, char **argv)
int opt = getopt_long_only (argc, argv,
longopts, 0);
......@@ -599,6 +604,10 @@ decode_options (int argc, char **argv)
print_help_and_exit ();
case 'F':
frame_parameters = optarg;
message (TRUE, "Try `%s --help' for more information\n", progname);
......@@ -665,6 +674,7 @@ The following OPTIONS are accepted:\n\
-nw, -t, --tty Open a new Emacs frame on the current terminal\n\
-c, --create-frame Create a new frame instead of trying to\n\
use the current Emacs frame\n\
-F, --frame-parameters Set the parameters of a new frame\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
-n, --no-wait Don't wait for the server to return\n\
-q, --quiet Don't display messages on success\n\
......@@ -1630,6 +1640,13 @@ main (int argc, char **argv)
send_to_emacs (emacs_socket, " ");
if (frame_parameters && !current_frame)
send_to_emacs (emacs_socket, "-frame-parameters ");
quote_argument (emacs_socket, frame_parameters);
send_to_emacs (emacs_socket, " ");
/* If using the current frame, send tty information to Emacs anyway.
In daemon mode, Emacs may need to occupy this tty if no other
frame is available. */
2011-06-25 Eli Zaretskii <>
* net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind
buffer-file-type before setting its value, to avoid disastrous
global effects on decoding files for DOS/Windows systems.
2011-06-25 Juanma Barranquero <>
* allout.el (allout-unload-function): Pass -1 to `allout-mode'.
* ses.el (ses-unload-function):
* emacs-lisp/re-builder.el (re-builder-unload-function): Simplify.
* proced.el (proced-unload-function):
* progmodes/cperl-mode.el (cperl-mode-unload-function): Remove.
2011-06-25 Andreas Rottmann <>
* server.el (server-create-window-system-frame): Add parameters arg.
(server-process-filter): Doc fix. Handle frame-parameters.
2011-06-25 Juanma Barranquero <>
Fix bug#8730, bug#8781.
* loadhist.el (unload--set-major-mode): New function.
(unload-feature): Use it.
* progmodes/python.el (python-after-info-look): Add autoload cookie.
(python-unload-function): New function.
2011-06-25 Stefan Monnier <>
* mail/rmail.el (rmail-show-message-1): Use restore-buffer-modified-p.
2011-06-25 Giuseppe Scrivano <>
* net/browse-url.el (browse-url-firefox-program): Add icecat to
the candidates list.
2011-06-24 Juanma Barranquero <>
* progmodes/verilog-mode.el (verilog-mode): Fix test for bound variable.
......@@ -2085,7 +2085,7 @@ OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
(dolist (buffer (buffer-list))
(set-buffer buffer)
(when (allout-mode-p) (allout-mode))))
(when (allout-mode-p) (allout-mode -1))))
;; continue standard unloading
......@@ -714,8 +714,7 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
(remove-hook 'after-change-functions 'reb-auto-update t)
(remove-hook 'kill-buffer-hook 'reb-kill-buffer t)
(when (reb-mode-buffer-p)
(funcall (or (default-value 'major-mode) 'fundamental-mode)))))
;; continue standard unloading
......@@ -143,6 +143,19 @@ documentation of `unload-feature' for details.")
(define-obsolete-variable-alias 'unload-hook-features-list
'unload-function-defs-list "22.2")
(defun unload--set-major-mode ()
(dolist (buffer (buffer-list))
(set-buffer buffer)
(let ((proposed major-mode))
;; Look for an antecessor mode not defined in the feature we're processing
(while (and proposed (rassq proposed unload-function-defs-list))
(setq proposed (get proposed 'derived-mode-parent)))
(unless (eq proposed major-mode)
;; Two cases: either proposed is nil, and we want to switch to fundamental
;; mode, or proposed is not nil and not major-mode, and so we use it.
(funcall (or proposed 'fundamental-mode)))))))
(defun unload-feature (feature &optional force)
"Unload the library that provided FEATURE.
......@@ -222,6 +235,10 @@ something strange, such as redefining an Emacs function."
(not (get (cdr y) 'autoload)))
(setq auto-mode-alist
(rassq-delete-all (cdr y) auto-mode-alist)))))
;; Change major mode in all buffers using one defined in the feature being unloaded.
(when (fboundp 'elp-restore-function) ; remove ELP stuff first
(dolist (elt unload-function-defs-list)
(when (symbolp elt)
......@@ -2674,7 +2674,7 @@ The current mail message becomes the message displayed."
(let ((modiff (buffer-modified-p)))
(rmail-set-attribute rmail-unseen-attr-index nil)
(unless modiff
(set-buffer-modified-p nil)))
(restore-buffer-modified-p modiff)))
;; bracket the message in the mail
;; buffer and determine the coding system the transfer encoding.
......@@ -3278,6 +3278,7 @@ system TYPE.")
(name (ange-ftp-quote-string (nth 2 parsed)))
(temp (ange-ftp-make-tmp-name host))
(binary (ange-ftp-binary-file filename))
(buffer-file-type buffer-file-type)
(abbr (ange-ftp-abbreviate-filename filename))
(coding-system-used last-coding-system-used)
......@@ -322,7 +322,7 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time
:group 'browse-url)
(defcustom browse-url-firefox-program
(let ((candidates '("firefox" "iceweasel")))
(let ((candidates '("firefox" "iceweasel" "icecat")))
(while (and candidates (not (executable-find (car candidates))))
(setq candidates (cdr candidates)))
(or (car candidates) "firefox"))
......@@ -1869,16 +1869,6 @@ buffer. You can use it to recover marks."
(message "Change in Proced buffer undone.
Killed processes cannot be recovered by Emacs."))
(defun proced-unload-function ()
"Unload the Proced library."
(dolist (buf (buffer-list))
(set-buffer buf)
(when (eq major-mode 'proced-mode)
(funcall (or (default-value 'major-mode) 'fundamental-mode)))))
;; continue standard unloading
(provide 'proced)
;;; proced.el ends here
......@@ -8971,18 +8971,6 @@ do extra unwind via `cperl-unwind-to-safe'."
(substring v (match-beginning 1) (match-end 1)))
"Version of IZ-supported CPerl package this file is based on.")
(defun cperl-mode-unload-function ()
"Unload the Cperl mode library."
(let ((new-mode (if (eq (symbol-function 'perl-mode) 'cperl-mode)
(dolist (buf (buffer-list))
(with-current-buffer buf
(when (eq major-mode 'cperl-mode)
(funcall new-mode)))))
;; continue standard unloading
(provide 'cperl-mode)
;;; cperl-mode.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment