Commit 67ab0163 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

parents d6e96966 27ac6e79
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired.texi (Dired): Dired-X version number was dropped.
2011-02-14 Jan Djärv <jan.h.d@swipnet.se>
* xresources.texi (X Resources): Remove *faceName and replace it with
......
......@@ -23,7 +23,7 @@ files. You first mark certain files in order to operate on all of
them with one command.
The Dired-X package provides various extra features for Dired mode.
@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}.
You can also view a list of files in a directory with @kbd{C-x C-d}
(@code{list-directory}). Unlike Dired, this command does not allow
......
2011-02-19 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
2011-01-23 Werner Lemberg <wl@gnu.org>
* Makefile.in (MAKEINFO): Now controlled by `configure'.
......
......@@ -216,7 +216,7 @@
 
@c ----------------------------------------------------
 
@dircategory Emacs
@dircategory GNU Emacs Lisp
@direntry
* Emacs Lisp Intro: (eintr).
A simple introduction to Emacs Lisp programming.
......
2011-02-19 Eli Zaretskii <eliz@gnu.org>
* elisp.texi: Sync @dircategory with ../../info/dir.
* files.texi (Visiting Functions): Document find-file-literally,
both the command and the variable.
* variables.texi (Creating Buffer-Local): Explain the meaning of
permanent local variables.
* files.texi (Visiting Functions): Document find-file-literally,
both the command and the variable.
* variables.texi (Creating Buffer-Local): Explain the meaning of
permanent local variables.
2011-02-19 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Remapping Commands): Mention how to undo it.
2011-02-09 Reuben Thomas <rrt@sc3d.org>
* loading.texi (Hooks for Loading): Remove unnecessary advice
......
......@@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory GNU Emacs Lisp
@direntry
* Elisp: (elisp). The Emacs Lisp Reference Manual.
@end direntry
......
......@@ -113,6 +113,26 @@ When @code{find-file} is called interactively, it prompts for
@var{filename} in the minibuffer.
@end deffn
@deffn Command find-file-literally filename
This command visits @var{filename}, like @code{find-file} does, but it
does not perform any format conversions (@pxref{Format Conversion}),
character code conversions (@pxref{Coding Systems}), or end-of-line
conversions (@pxref{Coding System Basics, End of line conversion}).
The buffer visiting the file is made unibyte, and its major mode is
Fundamental mode, regardless of the file name. File local variable
specifications in the file (@pxref{File Local Variables}) are
ignored, and automatic decompression and adding a newline at the end
of the file due to @code{require-final-newline} (@pxref{Saving
Buffers, require-final-newline}) are also disabled.
Note that if Emacs already has a buffer visiting the same file
non-literally, it will not visit the same file literally, but instead
just switch to the existing buffer. If you want to be sure of
accessing a file's contents literally, you should create a temporary
buffer and then read the file contents into it using
@code{insert-file-contents-literally} (@pxref{Reading from Files}).
@end deffn
@defun find-file-noselect filename &optional nowarn rawfile wildcards
This function is the guts of all the file-visiting functions. It
returns a buffer visiting the file @var{filename}. You may make the
......@@ -224,6 +244,16 @@ This is not a normal hook because the values of the functions are
used, and in many cases only some of the functions are called.
@end defvar
@defvar find-file-literally
This buffer-local variable, if set to a non-@code{nil} value, makes
@code{save-buffer} behave as if the buffer were visiting its file
literally, i.e. without conversions of any kind. The command
@code{find-file-literally} sets this variable's local value, but other
equivalent functions and commands can do that as well, e.g.@: to avoid
automatic addition of a newline at the end of the file. This variable
us permanent local, so it is unaffected by changes of major modes.
@end defvar
@node Subroutines of Visiting
@comment node-name, next, previous, up
@subsection Subroutines of Visiting
......
......@@ -1508,6 +1508,12 @@ does not have the effect of remapping @code{kill-line} into
if an ordinary binding specifies @code{my-kill-line}, this keymap will
remap it to @code{my-other-kill-line}.
To undo the remapping of a command, remap it to @code{nil}; e.g.
@smallexample
(define-key my-mode-map [remap kill-line] nil)
@end smallexample
@defun command-remapping command &optional position keymaps
This function returns the remapping for @var{command} (a symbol),
given the current active keymaps. If @var{command} is not remapped
......
......@@ -1407,6 +1407,8 @@ subsequent major mode. @xref{Hooks}.
@cindex permanent local variable
A buffer-local variable is @dfn{permanent} if the variable name (a
symbol) has a @code{permanent-local} property that is non-@code{nil}.
Such variables are unaffected by @code{kill-all-local-variables}, and
their local bindings are therefore not cleared by changing major modes.
Permanent locals are appropriate for data pertaining to where the file
came from or how to save it, rather than with how to edit the contents.
......
2011-02-19 Eli Zaretskii <eliz@gnu.org>
* ada-mode.texi: Sync @dircategory with ../../info/dir.
* auth.texi: Sync @dircategory with ../../info/dir.
* autotype.texi: Sync @dircategory with ../../info/dir.
* calc.texi: Sync @dircategory with ../../info/dir.
* cc-mode.texi: Sync @dircategory with ../../info/dir.
* cl.texi: Sync @dircategory with ../../info/dir.
* dbus.texi: Sync @dircategory with ../../info/dir.
* dired-x.texi: Sync @dircategory with ../../info/dir.
* ebrowse.texi: Sync @dircategory with ../../info/dir.
* ede.texi: Sync @dircategory with ../../info/dir.
* ediff.texi: Sync @dircategory with ../../info/dir.
* edt.texi: Sync @dircategory with ../../info/dir.
* eieio.texi: Sync @dircategory with ../../info/dir.
* emacs-mime.texi: Sync @dircategory with ../../info/dir.
* epa.texi: Sync @dircategory with ../../info/dir.
* erc.texi: Sync @dircategory with ../../info/dir.
* eshell.texi: Sync @dircategory with ../../info/dir.
* eudc.texi: Sync @dircategory with ../../info/dir.
* flymake.texi: Sync @dircategory with ../../info/dir.
* forms.texi: Sync @dircategory with ../../info/dir.
* gnus.texi: Sync @dircategory with ../../info/dir.
* idlwave.texi: Sync @dircategory with ../../info/dir.
* mairix-el.texi: Sync @dircategory with ../../info/dir.
* message.texi: Sync @dircategory with ../../info/dir.
* mh-e.texi: Sync @dircategory with ../../info/dir.
* newsticker.texi: Sync @dircategory with ../../info/dir.
* nxml-mode.texi: Sync @dircategory with ../../info/dir.
* org.texi: Sync @dircategory with ../../info/dir.
* pcl-cvs.texi: Sync @dircategory with ../../info/dir.
* pgg.texi: Sync @dircategory with ../../info/dir.
* rcirc.texi: Sync @dircategory with ../../info/dir.
* reftex.texi: Sync @dircategory with ../../info/dir.
* remember.texi: Sync @dircategory with ../../info/dir.
* sasl.texi: Sync @dircategory with ../../info/dir.
* sc.texi: Sync @dircategory with ../../info/dir.
* semantic.texi: Sync @dircategory with ../../info/dir.
* ses.texi: Sync @dircategory with ../../info/dir.
* sieve.texi: Sync @dircategory with ../../info/dir.
* smtpmail.texi: Sync @dircategory with ../../info/dir.
* speedbar.texi: Sync @dircategory with ../../info/dir.
* trampver.texi [emacs]: Set emacsname to "Emacs".
* tramp.texi: Sync @dircategory with ../../info/dir.
* url.texi: Sync @dircategory with ../../info/dir.
* vip.texi: Sync @dircategory with ../../info/dir.
* viper.texi: Sync @dircategory with ../../info/dir.
* widget.texi: Sync @dircategory with ../../info/dir.
* woman.texi: Sync @dircategory with ../../info/dir.
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Technical Details): No longer redefines dired-add-entry,
......
......@@ -19,7 +19,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code.
@end direntry
......
......@@ -32,7 +32,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* Auth-source: (auth). The Emacs auth-source library.
@end direntry
......
......@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Autotype: (autotype). Convenient features for text that you
enter frequently in Emacs.
......
......@@ -111,7 +111,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
 
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Calc: (calc). Advanced desk calculator and mathematical tool.
@end direntry
......@@ -177,7 +177,7 @@ developing GNU and promoting software freedom.''
@comment Info directory entry for use by install-info. The indentation
@comment here is by request from the FSF folks.
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
Java, Pike, AWK, and CORBA IDL code.
......
......@@ -21,7 +21,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* CL: (cl). Partial Common Lisp support for Emacs Lisp.
@end direntry
......
......@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* D-Bus: (dbus). Using D-Bus in Emacs.
@end direntry
......
......@@ -36,7 +36,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Dired-X: (dired-x). Dired Extra Features.
@end direntry
......
......@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Ebrowse: (ebrowse). A C++ class browser for Emacs.
@end direntry
......
......@@ -21,9 +21,9 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* ede: (ede). Project management for Emacs.
* EDE: (ede). The Emacs Development Environment.
@end direntry
@titlepage
......
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