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
d5e5e7b4
Commit
d5e5e7b4
authored
Dec 30, 2012
by
Glenn Morris
Browse files
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
parents
4f752957
5c560880
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
509 additions
and
575 deletions
+509
-575
ChangeLog
ChangeLog
+6
-0
configure.ac
configure.ac
+3
-7
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+8
-0
doc/lispref/functions.texi
doc/lispref/functions.texi
+1
-1
doc/lispref/intro.texi
doc/lispref/intro.texi
+1
-1
doc/lispref/syntax.texi
doc/lispref/syntax.texi
+2
-2
doc/lispref/variables.texi
doc/lispref/variables.texi
+1
-1
etc/NEWS
etc/NEWS
+401
-535
lisp/ChangeLog
lisp/ChangeLog
+25
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+11
-3
lisp/mail/rmailmm.el
lisp/mail/rmailmm.el
+2
-2
lisp/net/mairix.el
lisp/net/mairix.el
+5
-5
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+3
-1
lisp/org/ChangeLog
lisp/org/ChangeLog
+1
-6
msdos/ChangeLog
msdos/ChangeLog
+5
-0
msdos/sed1v2.inp
msdos/sed1v2.inp
+1
-1
src/ChangeLog
src/ChangeLog
+13
-0
src/Makefile.in
src/Makefile.in
+5
-5
src/dispextern.h
src/dispextern.h
+9
-4
src/xdisp.c
src/xdisp.c
+6
-1
No files found.
ChangeLog
View file @
d5e5e7b4
2012-12-30 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac (TEMACS_LDFLAGS2): Don't define.
(LIBS_GNUSTEP): Set for GNUstep and substitute.
(LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
2012-12-27 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_config_options): New.
...
...
configure.ac
View file @
d5e5e7b4
...
...
@@ -1475,8 +1475,8 @@ tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
...
...
@@ -1503,9 +1503,9 @@ if test "${with_ns}" != no; then
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
dnl If they had chosen to either define it or not, we could have
dnl just used AC_CHECK_DECL here.
...
...
@@ -1556,7 +1556,7 @@ fail;
fi
fi
AC_SUBST(
TEMACS_LDFLAGS2
)
AC_SUBST(
LIBS_GNUSTEP
)
INSTALL_ARCH_INDEP_EXTRA=install-etc
ns_self_contained=no
...
...
@@ -4287,10 +4287,6 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
...
...
doc/lispref/ChangeLog
View file @
d5e5e7b4
2012-12-30 Wolfgang Jenkner <wjenkner@inode.at>
* functions.texi (Declare Form):
* intro.texi (A Sample Function Description):
* syntax.texi (Syntax Table Internals, Syntax Table Functions):
* variables.texi (Using Lexical Binding): Don't use @var or CAPS
in @def.. commands. (Bug#13292)
2012-12-29 Eli Zaretskii <eliz@gnu.org>
* files.texi (Changing Files): Document the return values of
...
...
doc/lispref/functions.texi
View file @
d5e5e7b4
...
...
@@ -1266,7 +1266,7 @@ obsolete, or giving its forms a special @key{TAB} indentation
convention in Emacs Lisp mode.
@anchor{Definition of declare}
@defmac declare
@var{
specs
}
@dots{}
@defmac declare specs@dots{}
This macro ignores its arguments and evaluates to @code{nil}; it has
no run-time effect. However, when a @code{declare} form occurs in the
@var{declare} argument of a @code{defun} or @code{defsubst} function
...
...
doc/lispref/intro.texi
View file @
d5e5e7b4
...
...
@@ -408,7 +408,7 @@ stands for zero or more arguments. Parentheses are used when several
arguments are grouped into additional levels of list structure. Here
is an example:
@defspec count-loop (
@
var
{var} [@var{from} @var{
to
}
[
@var{
inc
}
]])
@var{
body
}
@dots{}
@defspec count-loop (var
[from
to [inc]]) body@dots{}
This imaginary special form implements a loop that executes the
@var{body} forms and then increments the variable @var{var} on each
iteration. On the first iteration, the variable has the value
...
...
doc/lispref/syntax.texi
View file @
d5e5e7b4
...
...
@@ -506,7 +506,7 @@ This function returns the current syntax table, which is the table for
the current buffer.
@end defun
@defmac with-syntax-table
@var{table} @var{
body
}
@dots{}
@defmac with-syntax-table
table
body@dots{}
This macro executes @var{body} using @var{table} as the current syntax
table. It returns the value of the last form in @var{body}, after
restoring the old current syntax table.
...
...
@@ -998,7 +998,7 @@ corresponds to each syntax flag.
@samp{4} @tab @code{(lsh 1 19)}
@end multitable
@defun string-to-syntax
@var{
desc
}
@defun string-to-syntax desc
Given a syntax descriptor @var{desc} (a string), this function returns
the corresponding raw syntax descriptor.
@end defun
...
...
doc/lispref/variables.texi
View file @
d5e5e7b4
...
...
@@ -1057,7 +1057,7 @@ variables}. Every variable that has been defined with @code{defvar},
(@pxref{Defining Variables}). All other variables are subject to
lexical binding.
@defun special-variable-p
SYMBOL
@defun special-variable-p
symbol
This function returns non-@code{nil} if @var{symbol} is a special
variable (i.e., it has a @code{defvar}, @code{defcustom}, or
@code{defconst} variable definition). Otherwise, the return value is
...
...
etc/NEWS
View file @
d5e5e7b4
This diff is collapsed.
Click to expand it.
lisp/ChangeLog
View file @
d5e5e7b4
2012-12-30 Glenn Morris <rgm@gnu.org>
* net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
Remove unnecessary/buggy autoloads (missing interactive). (Bug#13294)
(rmail-summary-displayed, rmail-summary): Declare.
(mairix-rmail-display): Just require rmail.
2012-12-30 Chong Yidong <cyd@gnu.org>
* emacs-lisp/package.el (package-untar-buffer): Improve integrity
check for the tarball contents.
2012-12-30 Matt Fidler <matt.fidler@alcon.com> (tiny change)
* emacs-lisp/package.el (package-untar-buffer): Handle problematic
tarfile content listings (Bug#13136).
2012-12-30 Mark Lillibridge <mark.lillibridge@hp.com>
* mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert
the undecoded text of the message being forwarded. (Bug#9521)
2012-12-30 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
integers, if they are real numbers. (Bug#13282)
* net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
Return `t' on success.
...
...
lisp/emacs-lisp/package.el
View file @
d5e5e7b4
...
...
@@ -596,6 +596,8 @@ EXTRA-PROPERTIES is currently unused."
(
defvar
tar-parse-info
)
(
declare-function
tar-untar-buffer
"tar-mode"
())
(
declare-function
tar-header-name
"tar-mode"
(
tar-header
))
(
declare-function
tar-header-link-type
"tar-mode"
(
tar-header
))
(
defun
package-untar-buffer
(
dir
)
"Untar the current buffer.
...
...
@@ -604,10 +606,16 @@ untar into a directory named DIR; otherwise, signal an error."
(
require
'tar-mode
)
(
tar-mode
)
;; Make sure everything extracts into DIR.
(
let
((
regexp
(
concat
"\\`"
(
regexp-quote
dir
)
"/"
)))
(
let
((
regexp
(
concat
"\\`"
(
regexp-quote
(
expand-file-name
dir
))
"/"
))
(
case-fold-search
(
memq
system-type
'
(
windows-nt
ms-dos
cygwin
))))
(
dolist
(
tar-data
tar-parse-info
)
(
unless
(
string-match
regexp
(
aref
tar-data
2
))
(
error
"Package does not untar cleanly into directory %s/"
dir
))))
(
let
((
name
(
expand-file-name
(
tar-header-name
tar-data
))))
(
or
(
string-match
regexp
name
)
;; Tarballs created by some utilities don't list
;; directories with a trailing slash (Bug#13136).
(
and
(
string-equal
dir
name
)
(
eq
(
tar-header-link-type
tar-data
)
5
))
(
error
"Package does not untar cleanly into directory %s/"
dir
)))))
(
tar-untar-buffer
))
(
defun
package-unpack
(
package
version
)
...
...
lisp/mail/rmailmm.el
View file @
d5e5e7b4
...
...
@@ -1368,8 +1368,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
(
let
((
message-buffer
(
with-current-buffer
forward-buffer
(
if
rmail-buffer-swapped
forward
-buffer
rmail-view
-buffer
))))
rmail-view
-buffer
forward
-buffer
))))
(
save-restriction
(
narrow-to-region
(
point
)
(
point
))
(
message-forward-make-body-mime
message-buffer
))))
...
...
lisp/net/mairix.el
View file @
d5e5e7b4
...
...
@@ -222,14 +222,12 @@ Currently there are 'threads and 'flags.")
;;; RMail
;; Display function:
(
autoload
'rmail
"rmail"
)
(
autoload
'rmail-summary-displayed
"rmail"
)
(
autoload
'rmail-summary
"rmailsum"
)
(
defvar
rmail-buffer
)
(
declare-function
rmail-summary-displayed
"rmail"
())
(
declare-function
rmail-summary
"rmailsum"
())
; autoloaded in rmail
(
defun
mairix-rmail-display
(
folder
)
"Display mbox file FOLDER with RMail."
(
require
'rmail
)
(
let
(
show-summary
)
;; If it exists, select existing RMail window
(
when
(
and
(
boundp
'rmail-buffer
)
...
...
@@ -249,6 +247,8 @@ Currently there are 'threads and 'flags.")
(
when
show-summary
(
rmail-summary
))))
(
defvar
rmail-buffer
)
;; Fetching mail header field:
(
defun
mairix-rmail-fetch-field
(
field
)
"Get mail header FIELD for current message using RMail."
...
...
lisp/net/tramp-sh.el
View file @
d5e5e7b4
...
...
@@ -1458,7 +1458,9 @@ and gid of the corresponding user is taken. Both parameters must be integers."
;; working with su(do)? when it is needed, so it shall succeed in
;; the majority of cases.
;; Don't modify `last-coding-system-used' by accident.
(
let
((
last-coding-system-used
last-coding-system-used
))
(
let
((
last-coding-system-used
last-coding-system-used
)
(
uid
(
and
(
numberp
uid
)
(
round
uid
)))
(
gid
(
and
(
numberp
gid
)
(
round
gid
))))
(
if
(
file-remote-p
filename
)
(
with-parsed-tramp-file-name
filename
nil
(
if
(
and
(
zerop
(
user-uid
))
(
tramp-local-host-p
v
))
...
...
lisp/org/ChangeLog
View file @
d5e5e7b4
...
...
@@ -4583,12 +4583,7 @@
(org-set-autofill-regexps): Add previous function to
`fill-nobreak-predicate'.
2012-04-01 Vitalie Spinu <spinuvit@gmail.com>
* ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
visibility regardless of local user customization.
2012-04-01 Vitalie Spinu <spinuvit@gmail.com>
2012-04-01 Vitalie Spinu <spinuvit@gmail.com> (tiny change)
* ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
visibility regardless of local user customization.
...
...
msdos/ChangeLog
View file @
d5e5e7b4
2012-12-30 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
(LIBS_GNUSTEP): Edit to empty.
2012-12-03 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before
...
...
msdos/sed1v2.inp
View file @
d5e5e7b4
...
...
@@ -49,7 +49,6 @@ s/\.h\.in/.h-in/
/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
/^LIB_GCC *=/s/@LIB_GCC@//
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
...
...
@@ -86,6 +85,7 @@ s/ *@LIBXPM@//
/^XOBJ *=/s/@XOBJ@//
/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
/^LIBSOUND *=/s/@LIBSOUND@//
/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@//
/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
/^RSVG_LIBS *=/s/@RSVG_LIBS@//
/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
...
...
src/ChangeLog
View file @
d5e5e7b4
2012-12-30 Andreas Schwab <schwab@linux-m68k.org>
* src/Makefile.in (TEMACS_LDFLAGS2): Remove.
(LIBS_GNUSTEP): Define.
(LIBES): Add $(LIBS_GNUSTEP).
(temacs$(EXEEXT)): Use $(LDFLAGS) instead of $(TEMACS_LDFLAGS2).
2012-12-30 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_cursor_from_row): Don't confuse a truncation or
continuation glyph on a TTY with an indication of an empty line.
(Bug#13277)
2012-12-29 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if
...
...
src/Makefile.in
View file @
d5e5e7b4
...
...
@@ -111,9 +111,6 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
## Flags to pass to ld only for temacs.
TEMACS_LDFLAGS
=
$(LD_SWITCH_SYSTEM)
$(LD_SWITCH_SYSTEM_TEMACS)
## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason).
TEMACS_LDFLAGS2
=
@TEMACS_LDFLAGS2@
## If available, the full path to the paxctl program.
## On grsecurity/PaX systems, unexec will fail due to a gap between
## the bss section and the heap. This can be prevented by disabling
...
...
@@ -230,6 +227,9 @@ LIBX_OTHER=@LIBX_OTHER@
## configure, which should set it to nil in non-X builds.
LIBX_BASE
=
$(LIBXMENU)
$(LD_SWITCH_X_SITE)
## Only used for GNUstep
LIBS_GNUSTEP
=
@LIBS_GNUSTEP@
LIBSOUND
=
@LIBSOUND@
CFLAGS_SOUND
=
@CFLAGS_SOUND@
...
...
@@ -400,7 +400,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
## Note that SunOS needs -lm to come before -lc; otherwise, you get
## duplicated symbols. If the standard libraries were compiled
## with GCC, we might need LIB_GCC again after them.
LIBES
=
$(LIBS)
$(W32_LIBS)
$(LIBX_BASE)
$(LIBIMAGE)
\
LIBES
=
$(LIBS)
$(W32_LIBS)
$(LIBS_GNUSTEP)
$(LIBX_BASE)
$(LIBIMAGE)
\
$(LIBX_OTHER)
$(LIBSOUND)
\
$(RSVG_LIBS)
$(IMAGEMAGICK_LIBS)
$(LIB_CLOCK_GETTIME)
\
$(LIB_EACCESS)
$(LIB_TIMER_TIME)
$(DBUS_LIBS)
\
...
...
@@ -475,7 +475,7 @@ $(lib)/libgnu.a: $(config_h)
temacs$(EXEEXT)
:
$(START_FILES) stamp-oldxmenu $(obj) $(otherobj)
\
$(lib)/libgnu.a $(W32_RES)
$(CC)
$(LD_FIRSTFLAG)
$(ALL_CFLAGS)
$(TEMACS_LDFLAGS)
$(
TEMACS_
LDFLAGS
2
)
\
$(CC)
$(LD_FIRSTFLAG)
$(ALL_CFLAGS)
$(TEMACS_LDFLAGS)
$(LDFLAGS)
\
-o
temacs
$(START_FILES)
$(obj)
$(otherobj)
$(lib)
/libgnu.a
$(LIBES)
\
$(W32_RES_LINK)
test
"
$(CANNOT_DUMP)
"
=
"yes"
||
\
...
...
src/dispextern.h
View file @
d5e5e7b4
...
...
@@ -317,13 +317,18 @@ struct glyph
Lisp string, this is a position in that string. If it is a
buffer, this is a position in that buffer. A value of -1
together with a null object means glyph is a truncation glyph at
the start of a row. */
the start of a row. Right truncation and continuation glyphs at
the right edge of a row have their position set to the next
buffer position that is not shown on this row. Glyphs inserted
by redisplay, such as the empty space after the end of a line on
TTYs, or the overlay-arrow on a TTY, have this set to -1. */
ptrdiff_t
charpos
;
/* Lisp object source of this glyph. Currently either a buffer or
a
string, if the glyph was produced from characters which came from
/* Lisp object source of this glyph. Currently either a buffer or
a
string, if the glyph was produced from characters which came from
a buffer or a string; or 0 if the glyph was inserted by redisplay
for its own purposes such as padding. */
for its own purposes, such as padding or truncation/continuation
glyphs, or the overlay-arrow glyphs on TTYs. */
Lisp_Object
object
;
/* Width in pixels. */
...
...
src/xdisp.c
View file @
d5e5e7b4
...
...
@@ -14189,7 +14189,12 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
CHARPOS is zero or negative. */
int empty_line_p =
(row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
&& INTEGERP (glyph->object) && glyph->charpos > 0;
&& INTEGERP (glyph->object) && glyph->charpos > 0
/* On a TTY, continued and truncated rows also have a glyph at
their end whose OBJECT is zero and whose CHARPOS is
positive (the continuation and truncation glyphs), but such
rows are obviously not "empty". */
&& !(row->continued_p || row->truncated_on_right_p);
if (row->ends_in_ellipsis_p && pos_after == last_pos)
{
...
...
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