Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6a8f8193
Commit
6a8f8193
authored
Oct 24, 2012
by
Kenichi Handa
Browse files
merge trunk
parents
7e70a152
d1069532
Changes
94
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
106 additions
and
65 deletions
+106
-65
ChangeLog
ChangeLog
+7
-0
Makefile.in
Makefile.in
+8
-5
configure.ac
configure.ac
+1
-1
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+8
-0
doc/emacs/custom.texi
doc/emacs/custom.texi
+7
-6
doc/emacs/kmacro.texi
doc/emacs/kmacro.texi
+5
-4
doc/lispintro/emacs-lisp-intro.texi
doc/lispintro/emacs-lisp-intro.texi
+7
-7
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+26
-0
doc/lispref/display.texi
doc/lispref/display.texi
+0
-8
doc/lispref/files.texi
doc/lispref/files.texi
+2
-3
doc/lispref/functions.texi
doc/lispref/functions.texi
+1
-1
doc/lispref/hooks.texi
doc/lispref/hooks.texi
+5
-5
doc/lispref/intro.texi
doc/lispref/intro.texi
+1
-1
doc/lispref/keymaps.texi
doc/lispref/keymaps.texi
+5
-5
doc/lispref/lists.texi
doc/lispref/lists.texi
+1
-1
doc/lispref/loading.texi
doc/lispref/loading.texi
+2
-2
doc/lispref/modes.texi
doc/lispref/modes.texi
+3
-3
doc/lispref/os.texi
doc/lispref/os.texi
+1
-1
doc/lispref/text.texi
doc/lispref/text.texi
+5
-4
doc/lispref/tips.texi
doc/lispref/tips.texi
+11
-8
No files found.
ChangeLog
View file @
6a8f8193
2012-10-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-etc): Don't install emacs22 icons.
* Makefile.in (emacs_transform): New variable.
(install-etc): Prefer a make variable to a shell variable.
2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
...
...
Makefile.in
View file @
6a8f8193
...
...
@@ -631,21 +631,24 @@ install-man:
done
## Install those items from etc/ that need to end up elsewhere.
# Like EMACS, but without EXEEXT.
emacs_transform
=
`
echo
emacs |
sed
'
$(TRANSFORM)
'
`
install-etc
:
umask
022
;
${MKDIR_P}
$(DESTDIR)${desktopdir}
dest
=
`
echo
emacs |
sed
'
$(TRANSFORM)
'
`
;
\
tmp
=
etc/emacs.tmpdesktop
;
rm
-f
$
${tmp}
;
\
sed
-e
"
/^Exec=emacs/ s/emacs/
$
${dest
}
/
"
\
-e
"
/^Icon=emacs/ s/emacs/
$
${dest
}
/
"
\
sed
-e
'
/^Exec=emacs/ s/emacs/
$
{emacs_transform
}
/
'
\
-e
'
/^Icon=emacs/ s/emacs/
$
{emacs_transform
}
/
'
\
${srcdir}
/etc/emacs.desktop
>
$
${tmp}
;
\
${INSTALL_DATA}
$
${tmp}
$(DESTDIR)${desktopdir}
/
$
${dest
}
.desktop
;
\
${INSTALL_DATA}
$
${tmp}
$(DESTDIR)${desktopdir}
/
$
{emacs_transform
}
.desktop
;
\
rm
-f
$
${tmp}
thisdir
=
`
/bin/pwd
`
;
\
cd
${iconsrcdir}
||
exit
1
;
umask
022
;
\
for
dir
in
*
/
*
/apps
*
/
*
/mimetypes
;
do
\
[
-d
$
${dir}
]
||
continue
;
\
(
cd
$
${thisdir}
;
${MKDIR_P}
$(DESTDIR)${icondir}
/
$
${dir}
)
;
\
for
icon
in
$
${dir}
/
*
.
*
;
do
\
for
icon
in
$
${dir}
/
emacs[.-]
*
;
do
\
[
-r
$
${icon}
]
||
continue
;
\
dest
=
`
echo
"
$
${icon}
"
|
sed
-e
's|.*/||'
-e
'
$(TRANSFORM)
'
`
;
\
(
cd
$
${thisdir}
;
\
...
...
configure.ac
View file @
6a8f8193
...
...
@@ -2538,7 +2538,7 @@ no_return_alloc_pixels
fi
if test "${HAVE_XPM}" = "yes"; then
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm lib
r
ary (-lXpm).])
LIBXPM=-lXpm
fi
fi
...
...
doc/emacs/ChangeLog
View file @
6a8f8193
2012-10-23 Stefan Monnier <monnier@iro.umontreal.ca>
* custom.texi (Hooks): Clarify that -hooks is deprecated.
2012-10-23 Chong Yidong <cyd@gnu.org>
* kmacro.texi (Edit Keyboard Macro): Fix typo.
2012-10-18 Dani Moncayo <dmoncayo@gmail.com>
* mini.texi (Completion Options): Fix off-by-one error. (Bug#12644)
...
...
doc/emacs/custom.texi
View file @
6a8f8193
...
...
@@ -838,7 +838,8 @@ is a normal hook.
@
cindex
abnormal
hook
A
few
hooks
are
@
dfn
{
abnormal
hooks
}.
Their
names
end
in
@
samp
{-
hooks
}
or
@
samp
{-
functions
},
instead
of
@
samp
{-
hook
}.
What
@
samp
{-
functions
},
instead
of
@
samp
{-
hook
}
(
some
old
code
may
also
use
the
deprecated
suffix
@
samp
{-
hooks
}).
What
makes
these
hooks
abnormal
is
the
way
its
functions
are
called
---
perhaps
they
are
given
arguments
,
or
perhaps
the
values
they
return
are
used
in
some
way
.
For
example
,
...
...
@@ -1735,11 +1736,11 @@ and @kbd{C-c p} in Texinfo mode:
@example
(add-hook 'texinfo-mode-hook
'
(lambda ()
(define-key texinfo-mode-map "
\
C
-
cp
"
'backward-paragraph)
(define-key texinfo-mode-map "
\
C
-
cn
"
'forward-paragraph)))
(lambda ()
(define-key texinfo-mode-map "
\
C
-
cp
"
'backward-paragraph)
(define-key texinfo-mode-map "
\
C
-
cn
"
'forward-paragraph)))
@end example
@node Modifier Keys
...
...
doc/emacs/kmacro.texi
View file @
6a8f8193
...
...
@@ -482,10 +482,11 @@ Edit the last 300 keystrokes as a keyboard macro
@kindex C-x C-k C-e
@kindex C-x C-k RET
You can edit the last keyboard macro by typing @kbd{C-x C-k C-e} or
@kbd{C-x C-k RET} (@code{kmacro-edit-macro}). This formats the macro
definition in a buffer and enters a specialized major mode for editing
it. Type @kbd{C-h m} once in that buffer to display details of how to
edit the macro. When you are finished editing, type @kbd{C-c C-c}.
@kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}). This formats the
macro definition in a buffer and enters a specialized major mode for
editing it. Type @kbd{C-h m} once in that buffer to display details
of how to edit the macro. When you are finished editing, type
@kbd{C-c C-c}.
@findex edit-kbd-macro
@kindex C-x C-k e
...
...
doc/lispintro/emacs-lisp-intro.texi
View file @
6a8f8193
...
...
@@ -17909,10 +17909,10 @@ file that set values:
@group
;; Set calendar highlighting colors
(setq calendar-load-hook
'
(lambda ()
(set-face-foreground 'diary-face "skyblue")
(set-face-background 'holiday-face "slate blue")
(set-face-foreground 'holiday-face "white")))
(lambda ()
(set-face-foreground 'diary-face "skyblue")
(set-face-background 'holiday-face "slate blue")
(set-face-foreground 'holiday-face "white")))
@end group
@end smallexample
...
...
@@ -20947,7 +20947,7 @@ not yet seen, @code{mapcar} and @code{lambda}.
@group
(defun one-fiftieth (full-range)
"Return list, each number one-fiftieth of previous."
(mapcar
'
(lambda (arg) (/ arg 50)) full-range))
(mapcar (lambda (arg) (/ arg 50)) full-range))
@end group
@end smallexample
...
...
@@ -21168,7 +21168,7 @@ and the second argument is @code{full-range}, which will be bound to
The whole expression looks like this:
@smallexample
(mapcar
'
(lambda (arg) (/ arg 50)) full-range))
(mapcar (lambda (arg) (/ arg 50)) full-range))
@end smallexample
@xref{Mapping Functions, , Mapping Functions, elisp, The GNU Emacs
...
...
@@ -21840,7 +21840,7 @@ each column."
@group
(defun one-fiftieth (full-range)
"Return list, each number of which is 1/50th previous."
(mapcar
'
(lambda (arg) (/ arg 50)) full-range))
(mapcar (lambda (arg) (/ arg 50)) full-range))
@end group
@end smallexample
...
...
doc/lispref/ChangeLog
View file @
6a8f8193
2012-10-23 Stefan Monnier <monnier@iro.umontreal.ca>
* hooks.texi (Standard Hooks): Clarify that -hooks is deprecated.
2012-10-23 Paul Eggert <eggert@cs.ucla.edu>
Fix outdated timestamp documentation in Elisp manual (bug#12706).
* files.texi (File Attributes):
* text.texi (Undo):
Time stamp resolution is now 1 picosecond, not 1 second.
2012-10-23 Chong Yidong <cyd@gnu.org>
* display.texi (Font Lookup): Remove font-list-limit.
* keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode
(Bug#12529).
2012-10-22 Glenn Morris <rgm@gnu.org>
* os.texi (Recording Input): Tiny fix.
* intro.texi (Lisp History):
* lists.texi (Sets And Lists): Refer to cl-lib rather than cl.
* tips.texi (Coding Conventions): Recommend cl-lib over cl.
2012-10-15 Chong Yidong <cyd@gnu.org>
* macros.texi (Defining Macros): defmacro is now a macro.
...
...
doc/lispref/display.texi
View file @
6a8f8193
...
...
@@ -2944,14 +2944,6 @@ The last three elements give additional information about the font.
encoding of the font.
@end defun
@defopt font-list-limit
This variable specifies maximum number of fonts to consider in font
matching. The function @code{x-family-fonts} will not return more
than that many fonts, and font selection will consider only that many
fonts when searching a matching font for face attributes. The default
is 100.
@end defopt
@node Fontsets
@subsection Fontsets
...
...
doc/lispref/files.texi
View file @
6a8f8193
...
...
@@ -1220,9 +1220,8 @@ point number.
The file's @acronym{GID}, likewise.
@item
The time of last access, as a list of two integers.
The first integer has the high-order 16 bits of time,
the second has the low 16 bits. (This is similar to the
The time of last access, as a list of four integers @code{(@var{sec-high}
@var{sec-low} @var{microsec} @var{picosec})}. (This is similar to the
value of @code{current-time}; see @ref{Time of Day}.) Note that on
some FAT-based filesystems, only the date of last access is recorded,
so this time will always hold the midnight of the day of last access.
...
...
doc/lispref/functions.texi
View file @
6a8f8193
...
...
@@ -978,7 +978,7 @@ anonymous function by quoting it as a list:
@example
@group
(defun double-property (symbol prop)
(change-property symbol prop
'
(lambda (x) (* 2 x))))
(change-property symbol prop (lambda (x) (* 2 x))))
@end group
@end example
...
...
doc/lispref/hooks.texi
View file @
6a8f8193
...
...
@@ -17,11 +17,11 @@ arguments and their values are completely ignored. The recommended way
to put a new function on such a hook is to call @code{add-hook}.
@xref{Hooks}, for more information about using hooks.
The variables whose names end in @samp{-
hooks} or @samp{-functions} are
usually @dfn{abnormal hooks}; their values are lists of functions, but
these functions are called in a special way
(they are passed arguments,
or their values are used). The variables
whose names end in
@samp{-function} have single functions as their values.
The variables whose names end in @samp{-
functions} are usually @dfn{abnormal
hooks} (some old code may also use the deprecated @samp{-hooks} suffix); their
values are lists of functions, but
these functions are called in a special way
(they are passed arguments,
or their
return
values are used).
The variables
whose names end in
@samp{-function} have single functions as their values.
This is not an exhaustive list, it only covers the more general hooks.
For example, every major mode defines a hook named
...
...
doc/lispref/intro.texi
View file @
6a8f8193
...
...
@@ -119,7 +119,7 @@ worry about it; this manual is self-contained.
@pindex cl
A certain amount of Common Lisp emulation is available via the
@file{cl} library. @xref{Top,, Overview, cl, Common Lisp Extensions}.
@file{cl
-lib
} library. @xref{Top,, Overview, cl, Common Lisp Extensions}.
Emacs Lisp is not at all influenced by Scheme; but the GNU project has
an implementation of Scheme, called Guile. We use it in all new GNU
...
...
doc/lispref/keymaps.texi
View file @
6a8f8193
...
...
@@ -78,11 +78,11 @@ representations, @ref{Init Rebinding,,, emacs, The GNU Emacs Manual}.
@defmac kbd keyseq-text
This macro converts the text @var{keyseq-text} (a string constant)
into a key sequence (a string or vector constant). The contents of
@var{keyseq-text} should
describe the key sequence using almost the same
syntax used in this manual. More precisely, it uses the same syntax
that Edit Macro mode uses for editing keyboard macros (@pxref{Ed
it
Keyboard Macro,,, emacs, The GNU Emacs
Manual}); you must surround
function key names with @samp{<@dots{}>
}.
@var{keyseq-text} should
use the same syntax as in the buffer invoked
by the @kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}) command; in
particular, you must surround function key names w
it
h
@samp{<@dots{}>}. @xref{Edit
Keyboard Macro,,, emacs, The GNU Emacs
Manual
}.
@example
(kbd "C-x") @result{} "\C-x"
...
...
doc/lispref/lists.texi
View file @
6a8f8193
...
...
@@ -1266,7 +1266,7 @@ functions for sets include @code{memq} and @code{delq}, and their
@quotation
@b{Common Lisp note:} Common Lisp has functions @code{union} (which
avoids duplicate elements) and @code{intersection} for set operations.
Although standard GNU Emacs Lisp does not have them, the @file{cl}
Although standard GNU Emacs Lisp does not have them, the @file{cl
-lib
}
library provides versions. @xref{Top,, Overview, cl, Common Lisp Extensions}.
@end quotation
...
...
doc/lispref/loading.texi
View file @
6a8f8193
...
...
@@ -897,8 +897,8 @@ It then restores any autoloads formerly associated with those symbols.
Before
restoring
the
previous
definitions
,
@
code
{
unload
-
feature
}
runs
@
code
{
remove
-
hook
}
to
remove
functions
in
the
library
from
certain
hooks
.
These
hooks
include
variables
whose
names
end
in
@
samp
{
hook
}
or
@
samp
{-
hooks
},
plus
those
listed
in
hooks
.
These
hooks
include
variables
whose
names
end
in
@
samp
{
-
hook
}
(
or
the
deprecated
suffix
@
samp
{-
hooks
}
)
,
plus
those
listed
in
@
code
{
unload
-
feature
-
special
-
hooks
},
as
well
as
@
code
{
auto
-
mode
-
alist
}.
This
is
to
prevent
Emacs
from
ceasing
to
function
because
important
hooks
refer
to
functions
that
are
no
longer
...
...
doc/lispref/modes.texi
View file @
6a8f8193
...
...
@@ -70,9 +70,9 @@ called. You can use @code{add-hook} to add a function to an abnormal
hook, but you must write the function to follow the hook's calling
convention.
By convention, abnormal hook names end in @samp{-functions}
or
@samp{-hooks}. If the
variable's name ends in @samp{-function}, then
its value is just a single
function, not a list of functions.
By convention, abnormal hook names end in @samp{-functions}
. If the
variable's name ends in @samp{-function}, then
its value is just a single
function, not a list of functions.
@menu
* Running Hooks:: How to run a hook.
...
...
doc/lispref/os.texi
View file @
6a8f8193
...
...
@@ -1963,7 +1963,7 @@ is the character Emacs currently uses for quitting, usually @kbd{C-g}.
This function returns a vector containing the last 300 input events from
the keyboard or mouse. All input events are included, whether or not
they were used as parts of key sequences. Thus, you always get the last
1
00 input events, not counting events generated by keyboard macros.
3
00 input events, not counting events generated by keyboard macros.
(These are excluded because they are less interesting for debugging; it
should be enough to see the events that invoked the macros.)
...
...
doc/lispref/text.texi
View file @
6a8f8193
...
...
@@ -1233,11 +1233,12 @@ reinsert it is @code{(abs @var{position})}. If @var{position} is
positive, point was at the beginning of the deleted text, otherwise it
was at the end.
@item (t @var{high}
.
@var{
low
})
@item (t @var{
sec-
high} @var{
sec-low} @var{microsec} @var{picosec
})
This kind of element indicates that an unmodified buffer became
modified. The elements @var{high} and @var{low} are two integers, each
recording 16 bits of the visited file's modification time as of when it
was previously visited or saved. @code{primitive-undo} uses those
modified. The list @code{(@var{sec-high} @var{sec-low} @var{microsec}
@var{picosec})} represents the visited file's modification time as of
when it was previously visited or saved, using the same format as
@code{current-time}; see @ref{Time of Day}. @code{primitive-undo} uses those
values to determine whether to mark the buffer as unmodified once again;
it does so only if the file's modification time matches those numbers.
...
...
doc/lispref/tips.texi
View file @
6a8f8193
...
...
@@ -120,15 +120,18 @@ library when needed. This way people who don't use those aspects of
your
file
do
not
need
to
load
the
extra
library
.
@
item
Please
don
't require the @code{cl} package of Common Lisp extensions at
run time. Use of this package is optional, and it is not part of the
standard Emacs namespace. If your package loads @code{cl} at run time,
that could cause name clashes for users who don'
t
use
that
package
.
However
,
there
is
no
problem
with
using
the
@
code
{
cl
}
package
at
compile
time
,
with
@
code
{(
eval
-
when
-
compile
(
require
'cl))}. That'
s
If
you
need
Common
Lisp
extensions
,
use
the
@
code
{
cl
-
lib
}
library
rather
than
the
old
@
code
{
cl
}
library
.
The
latter
does
not
use
a
clean
namespace
(
i
.
e
.,
its
definitions
do
not
start
with
a
@
samp
{
cl
-}
prefix
).
If
your
package
loads
@
code
{
cl
}
at
run
time
,
that
could
cause
name
clashes
for
users
who
don
't use that
package.
There is no problem with using the @code{cl} package at @emph{compile}
time, with @code{(eval-when-compile (require '
cl
))}.
That
's
sufficient for using the macros in the @code{cl} package, because the
compiler
expands
them
before
generating
the
byte
-
code
.
compiler expands them before generating the byte-code. It is still
better to use the more modern @code{cl-lib} in this case, though.
@item
When defining a major mode, please follow the major mode
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment