Commit 37b3d302 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from mainline.

parents 0ca2f89e 7d315eb6
2011-02-18 Paul Eggert <eggert@cs.ucla.edu>
Import IRIX 6.5 getloadavg fixes from gnulib.
* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
2011-02-16 Paul Eggert <eggert@cs.ucla.edu>
Import getloadavg module from gnulib.
......
......@@ -14475,6 +14475,8 @@ test -f "$srcdir/$gl_source_base/getloadavg.c" ||
gl_save_LIBS=$LIBS
# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
if test "x$ac_cv_func_getloadavg" = xyes; then :
......
2011-02-17 Teodor Zlatanov <tzz@lifelogs.com>
* auth.texi (Help for users): Use :port instead of :protocol for all
auth-source docs.
(GnuPG and EasyPG Assistant Configuration): Mention the default now is
to have two files in `auth-sources'.
2011-02-16 Glenn Morris <rgm@gnu.org>
* dired-x.texi: Use emacsver.texi to get Emacs version.
* Makefile.in ($(infodir)/dired-x, dired-x.dvi, dired-x.pdf):
Depend on emacsver.texi.
* dired-x.texi: Drop meaningless version number.
(Introduction): Remove old info.
(Optional Installation Dired Jump): Autoload from dired-x.
Remove incorrect info about loaddefs.el.
(Bugs): Just refer to M-x report-emacs-bug.
* dired-x.texi (Multiple Dired Directories): Update for rename of
default-directory-alist.
(Miscellaneous Commands): No longer mention very old VM version 4.
2011-02-15 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib.
......@@ -5,7 +28,8 @@
2011-02-14 Teodor Zlatanov <tzz@lifelogs.com>
* auth.texi (Help for users): Login collection is "Login" and not "login".
* auth.texi (Help for users):
Login collection is "Login" and not "login".
2011-02-13 Michael Albinus <michael.albinus@gmx.de>
......
......@@ -287,12 +287,12 @@ dbus.pdf: ${srcdir}/dbus.texi
$(ENVADD) $(TEXI2PDF) $<
dired-x : $(infodir)/dired-x
$(infodir)/dired-x: dired-x.texi
$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
$(mkinfodir)
cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
dired-x.dvi: ${srcdir}/dired-x.texi
dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
$(ENVADD) $(TEXI2DVI) $<
dired-x.pdf: ${srcdir}/dired-x.texi
dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
$(ENVADD) $(TEXI2PDF) $<
ebrowse : $(infodir)/ebrowse
......
......@@ -105,8 +105,7 @@ It's known as @var{:host} in @code{auth-source-search} queries. You
can also use @code{host}.
The @code{port} is the connection port or protocol. It's known as
@var{:port} in @code{auth-source-search} queries. You can also use
@code{protocol}.
@var{:port} in @code{auth-source-search} queries.
The @code{user} is the user name. It's known as @var{:user} in
@code{auth-source-search} queries. You can also use @code{login} and
......@@ -155,8 +154,8 @@ particular host and protocol. While you can get fancy, the default
and simplest configuration is:
@lisp
;;; old default: required :host and :protocol, not needed anymore
(setq auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)))
;;; old default: required :host and :port, not needed anymore
(setq auth-sources '((:source "~/.authinfo.gpg" :host t :port t)))
;;; mostly equivalent (see below about fallbacks) but shorter:
(setq auth-sources '((:source "~/.authinfo.gpg")))
;;; even shorter and the @emph{default}:
......@@ -263,7 +262,9 @@ TODO: how to include docstring?
@appendix GnuPG and EasyPG Assistant Configuration
If you don't customize @code{auth-sources}, the auth-source library
reads @code{~/.authinfo.gpg}, which is a GnuPG encrypted file.
reads @code{~/.authinfo.gpg}, which is a GnuPG encrypted file. Then
it will check @code{~/.authinfo} but it's not recommended to use such
an unencrypted file.
In Emacs 23 or later there is an option @code{auto-encryption-mode} to
automatically decrypt @code{*.gpg} files. It is enabled by default.
......
......@@ -7,10 +7,11 @@
@c [Dodd's address no longer valid.]
@comment %**start of header (This is for running Texinfo on a region.)
@c FOR GNU EMACS USE ../info/dired-x BELOW
@setfilename ../../info/dired-x
@c dired-x.el REVISION NUMBER
@settitle Dired Extra Version 2 User's Manual
@settitle Dired Extra User's Manual
@include emacsver.texi
@iftex
@finalout
@end iftex
......@@ -18,7 +19,8 @@
@comment %**end of header (This is for running Texinfo on a region.)
@copying
Copyright @copyright{} 1994-1995, 1999, 2001-2011 Free Software Foundation, Inc.
Copyright @copyright{} 1994-1995, 1999, 2001-2011
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......@@ -47,8 +49,7 @@ developing GNU and promoting software freedom.''
@titlepage
@sp 6
@c dired-x.el REVISION NUMBER
@center @titlefont{Dired Extra Version 2}
@center @titlefont{Dired Extra}
@sp 2
@center @titlefont{For The GNU Emacs}
@sp 1
......@@ -70,10 +71,9 @@ developing GNU and promoting software freedom.''
@node Top
@top Dired Extra
@comment node-name, next, previous, up
@noindent
This documents the ``extra'' features for Dired Mode for GNU Emacs that are
This documents the ``extra'' features for GNU Emacs's Dired Mode that are
provided by the file @file{dired-x.el}.
@itemize @bullet
......@@ -81,20 +81,8 @@ provided by the file @file{dired-x.el}.
@item
Based on @file{dired.texi} by Sebastian Kremer <sk@@thp.uni-koeln.de>
@c dired-x.el REVISION NUMBER
@item
For @file{dired-x.el} revision 2
@c @item
@c Revision of this manual: 2.53 (2001/02/25 14:05:46)
@c @item
@c Bugs to Lawrence R. Dodd <dodd@@roebling.poly.edu>. @emph{Please} type
@c @kbd{M-x dired-x-submit-report} to submit a bug report (@pxref{Bugs}).
@c @item
@c You can obtain a copy of this package via anonymous ftp in
@c @t{/roebling.poly.edu:/pub/packages/dired-x.tar.gz}
For @file{dired-x.el} as distributed with GNU Emacs @value{EMACSVER}.
@end itemize
......@@ -124,19 +112,11 @@ For @file{dired-x.el} revision 2
@end ifnottex
@node Introduction, Installation, Top, Top
@comment node-name, next, previous, up
@chapter Introduction
This documents the @emph{extra} features for Dired Mode for GNU Emacs. It
is derived from version 1.191 of Sebastian Kremer's @file{dired-x.el}.
In adopting this @file{dired-x.el} to GNU Emacs v19 some material that has
been incorporated into @file{dired.el} and @file{dired-aux.el} of the GNU Emacs
19 distribution has been removed and some material was modified for agreement
with the functions in @file{dired.el} and @file{dired-aux.el}. For example,
the code using @code{gmhist} history functions was replaced with code using
the mini-buffer history now built into GNU Emacs. Finally, a few other
features have been added and a few more functions have been bound to keys.
This documents some @emph{extra} features for GNU Emacs's Dired Mode
that are provided by @file{dired-x.el} (derived from Sebastian Kremer's
original @file{dired-x.el}).
@ifnottex
@menu
......@@ -146,7 +126,6 @@ features have been added and a few more functions have been bound to keys.
@end ifnottex
@node Features, Technical Details, , Introduction
@comment node-name, next, previous, up
@section Features
@cindex Features
......@@ -194,7 +173,6 @@ C-f} and @kbd{C-x 4 C-f} to @code{dired-x-find-file} and
Point}).
@node Technical Details, , Features, Introduction
@comment node-name, next, previous, up
@section Technical Details
@cindex Redefined functions
@cindex @file{dired-aux.el}
......@@ -222,7 +200,6 @@ and the following functions from @file{dired-aux.el}
@end itemize
@node Installation, Omitting Files in Dired, Introduction, Top
@comment node-name, next, previous, up
@chapter Installation
@noindent
......@@ -231,8 +208,8 @@ This manual describes the Dired features provided by the file
file and (optionally) set some variables.
@noindent
In your @file{.emacs} file in your home directory, or in the system-wide
initialization file @file{default.el} in the @file{site-lisp} directory, put
In your @file{~/.emacs} file, or in the system-wide initialization file
@file{default.el} in the @file{site-lisp} directory, put
@example
(add-hook 'dired-load-hook
......@@ -261,48 +238,27 @@ when you first type @kbd{C-x d}).
@end ifnottex
@node Optional Installation Dired Jump, Optional Installation File At Point, , Installation
@comment node-name, next, previous, up
@section Optional Installation Dired Jump
@cindex Autoloading @code{dired-jump} and @code{dired-jump-other-window}
In order to have @code{dired-jump} and @code{dired-jump-other-window}
(@pxref{Miscellaneous Commands}) work @emph{before} @code{dired} and
@code{dired-x} have been properly loaded the user should set-up an autoload
@code{dired-x} have been properly loaded you should set-up an autoload
for these functions. In your @file{.emacs} file put
@example
;; Autoload `dired-jump' and `dired-jump-other-window'.
;; We autoload from FILE dired.el. This will then load dired-x.el
;; and hence define `dired-jump' and `dired-jump-other-window'.
(define-key global-map "\C-x\C-j" 'dired-jump)
(define-key global-map "\C-x4\C-j" 'dired-jump-other-window)
(autoload (quote dired-jump) "dired" "\
Jump to Dired buffer corresponding to current buffer.
If in a file, Dired the current directory and move to file's line.
If in Dired already, pop up a level and goto old directory's line.
In case the proper Dired file line cannot be found, refresh the Dired
buffer and try again." t nil)
(autoload (quote dired-jump-other-window) "dired" "\
Like \\[dired-jump] (dired-jump) but in other window." t nil)
@end example
(autoload 'dired-jump "dired-x"
"Jump to Dired buffer corresponding to current buffer." t)
Note that in recent releases of GNU Emacs 19 (i.e., 19.25 or later) the file
@file{../lisp/loaddefs.el} of the Emacs distribution already contains the
proper auto-loading for @code{dired-jump} so you need only put
(autoload 'dired-jump-other-window "dired-x"
"Like \\[dired-jump] (dired-jump) but in other window." t)
@example
(define-key global-map "\C-x\C-j" 'dired-jump)
(define-key global-map "\C-x4\C-j" 'dired-jump-other-window)
@end example
@noindent
in your @file{.emacs} file in order to have @kbd{C-x C-j} work
before @code{dired} is loaded.
@node Optional Installation File At Point, , Optional Installation Dired Jump, Installation
@comment node-name, next, previous, up
@section Optional Installation File At Point
@cindex Binding @code{dired-x-find-file}
......@@ -335,7 +291,6 @@ loaded
@end example
@node Omitting Files in Dired, Local Variables, Installation, Top
@comment node-name, next, previous, up
@chapter Omitting Files in Dired
@cindex Omitting Files in Dired
......@@ -392,8 +347,6 @@ inside @code{dired-load-hook} (@pxref{Installation}) and then evaluate
@end ifnottex
@node Omitting Variables, Omitting Examples, , Omitting Files in Dired
@comment node-name, next, previous, up
@section Omitting Variables
@cindex Customizing file omitting
......@@ -501,7 +454,6 @@ will show up again after reverting the buffer, unlike the others.
@end table
@node Omitting Examples, Omitting Technical, Omitting Variables, Omitting Files in Dired
@comment node-name, next, previous, up
@section Examples of Omitting Various File Types
@itemize @bullet
......@@ -555,7 +507,6 @@ in the @code{dired-load-hook} (@pxref{Installation}).
@end itemize
@node Omitting Technical, , Omitting Examples, Omitting Files in Dired
@comment node-name, next, previous, up
@section Some Technical Details of Omitting
Loading @file{dired-x.el} will install Dired Omit by putting
......@@ -563,8 +514,8 @@ Loading @file{dired-x.el} will install Dired Omit by putting
call @code{dired-extra-startup}, which in turn calls @code{dired-omit-startup}
in your @code{dired-mode-hook}.
@c FIXME does the standard dir-locals mechanism obsolete this?
@node Local Variables, Shell Command Guessing, Omitting Files in Dired, Top
@comment node-name, next, previous, up
@chapter Local Variables for Dired Directories
@cindex Local Variables for Dired Directories
......@@ -633,7 +584,6 @@ Variables are hacked.
@end table
@node Shell Command Guessing, Virtual Dired, Local Variables, Top
@comment node-name, next, previous, up
@chapter Shell Command Guessing
@cindex Guessing shell commands for files.
......@@ -740,7 +690,6 @@ History list for commands that read dired-shell commands.
@end table
@node Virtual Dired, Advanced Mark Commands, Shell Command Guessing, Top
@comment node-name, next, previous, up
@chapter Virtual Dired
@cindex Virtual Dired
......@@ -782,7 +731,6 @@ The regexp is a bit more complicated than usual to exclude @file{.dired}
local-variable files.
@node Advanced Mark Commands, Multiple Dired Directories, Virtual Dired, Top
@comment node-name, next, previous, up
@chapter Advanced Mark Commands
@table @kbd
......@@ -829,8 +777,6 @@ Flag all files with a certain extension for deletion. A @samp{.} is
@end ifnottex
@node Advanced Cleaning Functions, Advanced Cleaning Variables, , Advanced Mark Commands
@comment node-name, next, previous, up
@section Advanced Cleaning Functions
@table @code
......@@ -862,8 +808,6 @@ and @file{*.dvi} files for deletion.
@end table
@node Advanced Cleaning Variables, Special Marking Function, Advanced Cleaning Functions, Advanced Mark Commands
@comment node-name, next, previous, up
@section Advanced Cleaning Variables
@noindent Variables used by the above cleaning commands (and in the default value for
......@@ -903,8 +847,6 @@ List of extensions of dispensable files created by Bib@TeX{}.
@end table
@node Special Marking Function, , Advanced Cleaning Variables, Advanced Mark Commands
@comment node-name, next, previous, up
@section Special Marking Function
@table @kbd
......@@ -961,7 +903,6 @@ to mark all @file{.el} files without a corresponding @file{.elc} file.
@end table
@node Multiple Dired Directories, Find File At Point, Advanced Mark Commands, Top
@comment node-name, next, previous, up
@chapter Multiple Dired Directories and Non-Dired Commands
@cindex Multiple Dired directories
......@@ -978,8 +919,8 @@ A general mechanism is provided for special handling of the working
directory in special major modes:
@table @code
@item default-directory-alist
@vindex default-directory-alist
@item dired-default-directory-alist
@vindex dired-default-directory-alist
Default: @code{((dired-mode . (dired-current-directory)))}
Alist of major modes and their notion of @code{default-directory}, as a
......@@ -990,12 +931,10 @@ in favor of @code{default-directory}.
@findex dired-default-directory
Use this function like you would use the variable
@code{default-directory}, except that @code{dired-default-directory}
also consults the variable @code{default-directory-alist}.
also consults the variable @code{dired-default-directory-alist}.
@end table
@node Find File At Point, Miscellaneous Commands, Multiple Dired Directories, Top
@comment node-name, next, previous, up
@section Find File At Point
@cindex Visiting a file mentioned in a buffer
@cindex Finding a file at point
......@@ -1072,7 +1011,6 @@ that uses the value of @code{dired-x-hands-off-my-keys} to determine if
@end table
@node Miscellaneous Commands, Bugs, Find File At Point, Top
@comment node-name, next, previous, up
@chapter Miscellaneous Commands
Miscellaneous features not fitting anywhere else:
......@@ -1141,13 +1079,12 @@ file (assumed to be a UNIX mail folder).
@vindex dired-vm-read-only-folders
If you give this command a prefix argument, it will visit the folder
read-only. This only works in VM 5, not VM 4.
read-only.
If the variable @code{dired-vm-read-only-folders} is @code{t},
@code{dired-vm} will
visit all folders read-only. If it is neither @code{nil} nor @code{t}, e.g.,
the symbol @code{if-file-read-only}, only files not writable by you are
visited read-only. This is the recommended value if you run VM 5.
@code{dired-vm} will visit all folders read-only. If it is neither
@code{nil} nor @code{t}, e.g., the symbol @code{if-file-read-only}, only
files not writable by you are visited read-only.
@vindex dired-bind-vm
If the variable @code{dired-bind-vm} is @code{t}, @code{dired-vm} will be bound
......@@ -1210,50 +1147,30 @@ info.
@end table
@node Bugs, GNU Free Documentation License, Miscellaneous Commands, Top
@comment node-name, next, previous, up
@chapter Bugs
@cindex Bugs
@findex dired-x-submit-report
@noindent
If you encounter a bug in this package, wish to suggest an
enhancement, or want to make a smart remark, then type
@example
@kbd{M-x dired-x-submit-report}
@end example
@noindent
to set up an outgoing mail buffer, with the proper address to the
@file{dired-x.el} maintainer automatically inserted in the @samp{To:@:} field.
This command also inserts information that the Dired X maintainer can use to
recreate your exact setup, making it easier to verify your bug or social
maladjustment.
Lawrence R. Dodd
@c <dodd@@roebling.poly.edu>
If you encounter a bug in this package, or wish to suggest an
enhancement, then please use @kbd{M-x report-emacs-bug} to report it.
@node GNU Free Documentation License, Concept Index, Bugs, Top
@appendix GNU Free Documentation License
@include doclicense.texi
@node Concept Index, Command Index, GNU Free Documentation License, Top
@comment node-name, next, previous, up
@unnumbered Concept Index
@printindex cp
@node Command Index, Key Index, Concept Index, Top
@comment node-name, next, previous, up
@unnumbered Function Index
@printindex fn
@node Key Index, Variable Index, Command Index, Top
@comment node-name, next, previous, up
@unnumbered Key Index
@printindex ky
@node Variable Index, , Key Index, Top
@comment node-name, next, previous, up
@unnumbered Variable Index
@printindex vr
......
2011-02-17 Ken Manheimer <ken.manheimer@gmail.com>
* etc/images/icons/allout-widgets/dark-bg,
etc/images/icons/allout-widgets/light-bg,
encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}:
Reorganize icon directories and files to reconcile against windows
short-filename clashes.
2011-02-16 Ken Manheimer <ken.manheimer@gmail.com>
* etc/images/icons/allout-widgets-dark-bg,
etc/images/icons/allout-widgets-light-bg: Icons for new
allout-widgets.el.
* etc/images/icons/README: Include coypright and GPL 3 license for
new icons.
2011-02-16 Michael Albinus <michael.albinus@gmx.de>
* NEWS: Add soap-client.el and soap-inspect.el.
2011-02-13 Michael Albinus <michael.albinus@gmx.de>
* NEWS: Tramp methods "imap" and "imaps" are discontinued.
......
......@@ -639,6 +639,9 @@ secrets.
** notifications.el provides an implementation of the Desktop
Notifications API. It requires D-Bus for communication.
** soap-client.el supports access to SOAP web services from Emacs.
soap-inspect.el is an interactive inspector for SOAP WSDL structures.
* Incompatible Lisp Changes in Emacs 24.1
......
......@@ -15,3 +15,52 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
Copyright (C) 2005-2011 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
Files: allout-widgets-dark-bg/closed.png
allout-widgets-dark-bg/closed.xpm
allout-widgets-dark-bg/empty.png
allout-widgets-dark-bg/empty.xpm
allout-widgets-dark-bg/encrypted-locked.png
allout-widgets-dark-bg/encrypted-locked.xpm
allout-widgets-dark-bg/encrypted-unlocked.png
allout-widgets-dark-bg/encrypted-unlocked.xpm
allout-widgets-dark-bg/end-connector.png
allout-widgets-dark-bg/end-connector.xpm
allout-widgets-dark-bg/extender-connector.png
allout-widgets-dark-bg/extender-connector.xpm
allout-widgets-dark-bg/leaf.png
allout-widgets-dark-bg/leaf.xpm
allout-widgets-dark-bg/mid-connector.png
allout-widgets-dark-bg/mid-connector.xpm
allout-widgets-dark-bg/opened.png
allout-widgets-dark-bg/opened.xpm
allout-widgets-dark-bg/skip-descender.png
allout-widgets-dark-bg/skip-descender.xpm
allout-widgets-dark-bg/through-descender.png
allout-widgets-dark-bg/through-descender.xpm
allout-widgets-light-bg/closed.png
allout-widgets-light-bg/closed.xpm
allout-widgets-light-bg/empty.png
allout-widgets-light-bg/empty.xpm
allout-widgets-light-bg/encrypted-locked.png
allout-widgets-light-bg/encrypted-locked.xpm
allout-widgets-light-bg/encrypted-unlocked.png
allout-widgets-light-bg/encrypted-unlocked.xpm
allout-widgets-light-bg/end-connector.png
allout-widgets-light-bg/end-connector.xpm
allout-widgets-light-bg/extender-connector.png
allout-widgets-light-bg/extender-connector.xpm
allout-widgets-light-bg/leaf.png
allout-widgets-light-bg/leaf.xpm
allout-widgets-light-bg/mid-connector.png
allout-widgets-light-bg/mid-connector.xpm
allout-widgets-light-bg/opened.png
allout-widgets-light-bg/opened.xpm
allout-widgets-light-bg/skip-descender.png
allout-widgets-light-bg/skip-descender.xpm
allout-widgets-light-bg/through-descender.png
allout-widgets-light-bg/through-descender.xpm
Author: Ken Manheimer <ken.manheimer@gmail.com>
Copyright (C) 2011 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
This diff was suppressed by a .gitattributes entry.
/* XPM */
static char *dummy[]={
"9 17 10 1",
". c None",
"# c #000080",
"h c #52a55a",
"g c #52ad52",
"e c #5ab54a",
"d c #5abd42",
"c c #63c639",
"b c #63ce31",
"f c #ada5c6",
"a c #ffff00",
".........",
".........",
".........",
"######...",
"aaaaaa#..",
".bbcdaa#.",
".###deaa#",
"..ff##gaa",
"fffff##ha",
"..ff##haa",
".###ghaa#",
".eeggaa#.",
"aaaaaa#..",
"######...",
".........",
".........",
"........."};
This diff was suppressed by a .gitattributes entry.
/* XPM */
static char *dummy[]={
"10 17 9 1",
". c None",
"# c #000080",
"f c #52a55a",
"g c #52ad52",
"d c #5abd42",
"b c #63c639",
"c c #6bd629",
"e c #ada5c6",
"a c #ffff00",
"..........",
"..........",
"..........",
"...######.",
"..#aaaaaa.",
".#aabbbb..",
"#aabc###..",
"aad##ee...",
"adeeeee...",