diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 66f7a352023..52cc8f86bcf 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -2511,12 +2511,12 @@ Search-based fontification happens second. The Font Lock functionality is based on several basic functions. Each of these calls the function specified by the corresponding -variable. This indirection allows major modes to modify the way -fontification works in the buffers of that mode, and even use the Font -Lock mechanisms for features that have nothing to do with +variable. This indirection allows major and minor modes to modify the +way fontification works in the buffers of that mode, and even use the +Font Lock mechanisms for features that have nothing to do with fontification. (This is why the description below says ``should'' -when it describes what the functions do: the major mode can customize -the values of the corresponding variables to do something entirely +when it describes what the functions do: the mode can customize the +values of the corresponding variables to do something entirely different.) The variables mentioned below are described in @ref{Other Font Lock Variables}. @@ -2563,10 +2563,10 @@ variable. The value assigned to this variable is used, if and when Font Lock mode is enabled, to set all the other variables. @defvar font-lock-defaults -This variable is set by major modes to specify how to fontify text in -that mode. It automatically becomes buffer-local when set. If its -value is @code{nil}, Font Lock mode does no highlighting, and you can -use the @samp{Faces} menu (under @samp{Edit} and then @samp{Text +This variable is set by modes to specify how to fontify text in that +mode. It automatically becomes buffer-local when set. If its value +is @code{nil}, Font Lock mode does no highlighting, and you can use +the @samp{Faces} menu (under @samp{Edit} and then @samp{Text Properties} in the menu bar) to assign faces explicitly to text in the buffer. diff --git a/etc/NEWS b/etc/NEWS index cf09350d173..8c7f4942ac5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -588,7 +588,13 @@ additionally need to add `getSelection' to `xterm-extra-capabilities'. *** `xterm-mouse-mode' now supports mouse-tracking (if your xterm supports it). --- -** The `save-place' variable is replaced by `save-place-mode'. +** To turn on `save-place' mode globally, you must call `(save-place-mode 1)'. +In order to have the last place in every file saved it is no longer +sufficient to load the saveplace library and set the default value of +`save-place' to non-nil. You must explicitly call the function +`save-place-mode' with a positive argument instead. The `save-place' +variable is now an obsolete alias for `save-place-mode', which +replaces it. ** ERC @@ -702,6 +708,11 @@ dependencies). This variable can also be manually customized. *** New command `package-install-selected-packages' installs all packages from `package-selected-packages' which are currently missing. +--- +*** `package-install' function now takes a DONT-SELECT argument. If +this function is called interactively or if DONT-SELECT is nil, add the +package being installed to `package-selected-packages'. + --- *** New command `package-autoremove' removes all packages which were installed strictly as dependencies but are no longer needed. diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 3540fd14261..764d01ce6db 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -618,8 +618,11 @@ This command assumes point is not in a string or comment." (if (and open close) (if (and transient-mark-mode mark-active) (progn - (save-excursion (goto-char (region-end)) (insert close)) - (save-excursion (goto-char (region-beginning)) (insert open))) + (save-excursion + (goto-char (region-end)) + (insert close)) + (goto-char (region-beginning)) + (insert open)) (if arg (setq arg (prefix-numeric-value arg)) (setq arg 0)) (cond ((> arg 0) (skip-chars-forward " \t")) diff --git a/lisp/saveplace.el b/lisp/saveplace.el index c9148dcfc50..c27df150248 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -155,7 +155,7 @@ the argument is positive. To save places automatically in all files, put this in your init file: -\(setq-default save-place t)" +\(save-place-mode 1)" (interactive "P") (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode) (boundp 'dired-subdir-alist) diff --git a/nextstep/README b/nextstep/README index c16d55b35b9..7724afa43bf 100644 --- a/nextstep/README +++ b/nextstep/README @@ -8,10 +8,15 @@ NextStep (NS), including OS X (Mac) and GNUstep, using the Cocoa API. HISTORY -Up to Emacs 22, the OS X interface was implemented using the C-based -Carbon API. Starting with Emacs 23, the interface was rewritten in -Objective-C using the Cocoa API. Meanwhile, the Carbon interface has -been maintained independently under the name "mac". + +The Nextstep (NS) interface of GNU Emacs was originally written in +1994 for NeXTSTEP systems running Emacs 19 and subsequently ported to +OpenStep and then Rhapsody, which became Mac OS X. In 2004 it was +adapted to GNUstep, a free OpenStep implementation, and in 2008 it was +merged to the GNU Emacs trunk and released with Emacs 23. Around the +same time a separate Mac-only port using the Carbon APIs and +descending from a 2001 MacOS 8/9 port of Emacs 21 was removed. (It +remains available externally under the name "mac".) OVERVIEW OF COCOA AND OBJECTIVE-C diff --git a/src/dispnew.c b/src/dispnew.c index fe07f793cb5..b05356a3b64 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -681,7 +681,7 @@ void clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end) { eassert (start <= end); - eassert (start >= 0 && start < matrix->nrows); + eassert (start >= 0 && start <= matrix->nrows); eassert (end >= 0 && end <= matrix->nrows); for (; start < end; ++start) diff --git a/src/frame.c b/src/frame.c index df473aebc21..fd9f3ce0203 100644 --- a/src/frame.c +++ b/src/frame.c @@ -865,6 +865,9 @@ make_initial_frame (void) /* The default value of menu-bar-mode is t. */ set_menu_bar_lines (f, make_number (1), Qnil); + /* Allocate glyph matrices. */ + adjust_frame_glyphs (f); + if (!noninteractive) init_frame_faces (f);