mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-07 20:30:32 -08:00
auto upstream
This commit is contained in:
Joakim Verona
commit
b18e01b65e
34 changed files with 1886 additions and 127 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2013-01-04 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* info/dir: Add htmlfontify.
|
||||
|
||||
2013-01-04 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Merge from gnulib, incorporating:
|
||||
2013-01-04 stdio: remove now-unnecessary stdio.c
|
||||
2013-01-04 fprintftime: depend on stdio, not ignore-value
|
||||
2013-01-04 fwrite: silence __wur only for older glibc versions
|
||||
2013-01-04 fwrite: silence __wur without using inline
|
||||
* lib/stdio.c: Remove.
|
||||
* lib/stdio.in.h, lib/strftime.c: Update from gnulib.
|
||||
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
|
||||
|
||||
2013-01-02 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Merge from gnulib, incorporating copyright-date changes and:
|
||||
|
|
|
|||
|
|
@ -119,8 +119,8 @@ am__libgnu_a_SOURCES_DIST = allocator.c c-ctype.h c-ctype.c \
|
|||
c-strcase.h c-strcasecmp.c c-strncasecmp.c careadlinkat.c \
|
||||
close-stream.c md5.c sha1.c sha256.c sha512.c dtoastr.c \
|
||||
dtotimespec.c filemode.c gettext.h gettime.c stat-time.c \
|
||||
stdio.c strftime.c timespec.c timespec-add.c timespec-sub.c \
|
||||
u64.c unistd.c utimens.c
|
||||
strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \
|
||||
unistd.c utimens.c
|
||||
am__objects_1 =
|
||||
am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
|
||||
c-strcasecmp.$(OBJEXT) c-strncasecmp.$(OBJEXT) \
|
||||
|
|
@ -128,9 +128,9 @@ am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
|
|||
sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \
|
||||
dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) filemode.$(OBJEXT) \
|
||||
$(am__objects_1) gettime.$(OBJEXT) stat-time.$(OBJEXT) \
|
||||
stdio.$(OBJEXT) strftime.$(OBJEXT) timespec.$(OBJEXT) \
|
||||
timespec-add.$(OBJEXT) timespec-sub.$(OBJEXT) u64.$(OBJEXT) \
|
||||
unistd.$(OBJEXT) utimens.$(OBJEXT)
|
||||
strftime.$(OBJEXT) timespec.$(OBJEXT) timespec-add.$(OBJEXT) \
|
||||
timespec-sub.$(OBJEXT) u64.$(OBJEXT) unistd.$(OBJEXT) \
|
||||
utimens.$(OBJEXT)
|
||||
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
|
||||
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
|
|
@ -920,9 +920,9 @@ DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
|
|||
libgnu_a_SOURCES = allocator.c c-ctype.h c-ctype.c c-strcase.h \
|
||||
c-strcasecmp.c c-strncasecmp.c careadlinkat.c close-stream.c \
|
||||
md5.c sha1.c sha256.c sha512.c dtoastr.c dtotimespec.c \
|
||||
filemode.c $(am__append_1) gettime.c stat-time.c stdio.c \
|
||||
strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \
|
||||
unistd.c utimens.c
|
||||
filemode.c $(am__append_1) gettime.c stat-time.c strftime.c \
|
||||
timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \
|
||||
utimens.c
|
||||
libgnu_a_LIBADD = $(gl_LIBOBJS)
|
||||
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
|
||||
EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c euidaccess.c execinfo.c \
|
||||
|
|
@ -1025,7 +1025,6 @@ distclean-compile:
|
|||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig2str.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoimax.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
2013-01-04 Ari Roponen <ari.roponen@gmail.com> (tiny change)
|
||||
|
||||
* hash.texi (Defining Hash): Fix typo. (Bug#13345)
|
||||
|
||||
2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* files.texi (File Attributes): Undocument return format of file-acl.
|
||||
|
||||
2013-01-03 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* processes.texi (System Processes):
|
||||
|
|
|
|||
|
|
@ -1363,7 +1363,7 @@ security APIs.
|
|||
|
||||
@defun file-acl filename
|
||||
This function returns the ACL entries of the file @var{filename}. The
|
||||
return value is a platform-dependent string containing the textual
|
||||
return value is a platform-dependent object containing some
|
||||
representation of the ACL entries. Don't use it for anything except
|
||||
passing it to the @code{set-file-acl} function (@pxref{Changing Files,
|
||||
set-file-acl}).
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ compared case-insensitively.
|
|||
|
||||
@example
|
||||
(defun case-fold-string= (a b)
|
||||
(compare-strings a nil nil b nil nil t))
|
||||
(eq t (compare-strings a nil nil b nil nil t)))
|
||||
(defun case-fold-string-hash (a)
|
||||
(sxhash (upcase a)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,19 @@
|
|||
2013-01-04 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
|
||||
Add htmlfontify.
|
||||
(htmlfontify, $(buildinfodir)/htmlfontify$(INFO_EXT))
|
||||
(htmlfontify.dvi, htmlfontify.pdf): New targets.
|
||||
* makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add htmlfontify.
|
||||
($(infodir)/htmlfontify$(INFO_EXT), htmlfontify.dvi): New targets.
|
||||
|
||||
* htmlfontify.texi: Miscellaneous fixes and updates.
|
||||
Set copyright to FSF, update license to GFDL 1.3+.
|
||||
|
||||
2013-01-04 Vivek Dasmohapatra <vivek@etla.org>
|
||||
|
||||
* htmlfontify.texi: New file.
|
||||
|
||||
2013-01-02 Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
||||
* calc.texi (Free-Form Dates): Expand on the date reading
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ MAKEINFO_OPTS = --force -I$(emacsdir)
|
|||
INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \
|
||||
dbus dired-x ebrowse ede ediff edt eieio \
|
||||
emacs-mime epa erc ert eshell eudc efaq \
|
||||
flymake forms gnus emacs-gnutls idlwave info.info \
|
||||
flymake forms gnus emacs-gnutls htmlfontify idlwave info.info \
|
||||
mairix-el message mh-e newsticker nxml-mode \
|
||||
org pcl-cvs pgg rcirc remember reftex sasl \
|
||||
sc semantic ses sieve smtpmail speedbar srecode tramp \
|
||||
|
|
@ -75,6 +75,7 @@ DVI_TARGETS = \
|
|||
forms.dvi \
|
||||
gnus.dvi \
|
||||
emacs-gnutls.dvi \
|
||||
htmlfontify.dvi \
|
||||
idlwave.dvi \
|
||||
info.dvi \
|
||||
mairix-el.dvi \
|
||||
|
|
@ -129,6 +130,7 @@ PDF_TARGETS = \
|
|||
flymake.pdf \
|
||||
forms.pdf \
|
||||
gnus.pdf \
|
||||
htmlfontify.pdf \
|
||||
emacs-gnutls.pdf \
|
||||
idlwave.pdf \
|
||||
info.pdf \
|
||||
|
|
@ -440,6 +442,15 @@ gnus.pdf: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
|
|||
cp gnustmp.pdf $@
|
||||
rm gnustmp.*
|
||||
|
||||
htmlfontify : $(buildinfodir)/htmlfontify$(INFO_EXT)
|
||||
$(buildinfodir)/htmlfontify$(INFO_EXT): ${srcdir}/htmlfontify.texi ${gfdl}
|
||||
$(mkinfodir)
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/htmlfontify.texi
|
||||
htmlfontify.dvi: ${srcdir}/htmlfontify.texi ${gfdl}
|
||||
$(ENVADD) $(TEXI2DVI) ${srcdir}/htmlfontify.texi
|
||||
htmlfontify.pdf: ${srcdir}/htmlfontify.texi ${gfdl}
|
||||
$(ENVADD) $(TEXI2PDF) ${srcdir}/htmlfontify.texi
|
||||
|
||||
# NB this one needs --no-split even without a .info extension.
|
||||
idlwave : $(buildinfodir)/idlwave$(INFO_EXT)
|
||||
$(buildinfodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi ${gfdl}
|
||||
|
|
|
|||
1609
doc/misc/htmlfontify.texi
Normal file
1609
doc/misc/htmlfontify.texi
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -56,7 +56,7 @@ INFO_TARGETS = $(infodir)/ccmode$(INFO_EXT) \
|
|||
$(infodir)/auth$(INFO_EXT) $(infodir)/eieio$(INFO_EXT) $(infodir)/ede$(INFO_EXT) \
|
||||
$(infodir)/semantic$(INFO_EXT) $(infodir)/edt$(INFO_EXT) $(infodir)/emacs-gnutls$(INFO_EXT) \
|
||||
$(infodir)/srecode$(INFO_EXT) $(infodir)/bovine$(INFO_EXT) \
|
||||
$(infodir)/wisent$(INFO_EXT)
|
||||
$(infodir)/wisent$(INFO_EXT) $(infodir)/htmlfontify$(INFO_EXT)
|
||||
DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \
|
||||
ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
|
||||
sieve.dvi pgg.dvi mh-e.dvi \
|
||||
|
|
@ -68,7 +68,7 @@ DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \
|
|||
remember.dvi nxml-mode.dvi \
|
||||
epa.dvi mairix-el.dvi sasl.dvi auth.dvi eieio.dvi ede.dvi \
|
||||
semantic.dvi edt.dvi emacs-gnutls.dvi srecode.dvi bovine.dvi \
|
||||
wisent.dvi
|
||||
wisent.dvi htmlfontify.dvi
|
||||
INFOSOURCES = info.texi
|
||||
|
||||
# The following rule does not work with all versions of `make'.
|
||||
|
|
@ -374,6 +374,12 @@ $(infodir)/wisent$(INFO_EXT): wisent.texi
|
|||
wisent.dvi: wisent.texi
|
||||
$(ENVADD) $(TEXI2DVI) $(srcdir)/wisent.texi
|
||||
|
||||
$(infodir)/htmlfontify$(INFO_EXT): htmlfontify.texi
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ htmlfontify.texi
|
||||
htmlfontify.dvi: htmlfontify.texi
|
||||
$(ENVADD) $(TEXI2DVI) $(srcdir)/htmlfontify.texi
|
||||
|
||||
|
||||
$(INFO_TARGETS): doclicense.texi
|
||||
$(DVI_TARGETS): doclicense.texi
|
||||
|
||||
|
|
@ -406,7 +412,8 @@ clean: mostlyclean
|
|||
$(infodir)/eieio* $(infodir)/ede* \
|
||||
$(infodir)/semantic* $(infodir)edt* \
|
||||
$(infodir)/emacs-gnutls* $(infodir)/srecode* \
|
||||
$(infodir)/bovine* $(infodir)/wisent*
|
||||
$(infodir)/bovine* $(infodir)/wisent* \
|
||||
$(infodir)/htmlfontify*
|
||||
|
||||
distclean: clean
|
||||
- $(DEL) makefile
|
||||
|
|
|
|||
1
info/dir
1
info/dir
|
|
@ -74,6 +74,7 @@ Emacs misc features
|
|||
* Flymake: (flymake). A universal on-the-fly syntax checker.
|
||||
* Forms: (forms). Emacs package for editing data bases
|
||||
by filling in forms.
|
||||
* Htmlfontify: (htmlfontify). Convert source code to html.
|
||||
* PCL-CVS: (pcl-cvs). Emacs front-end to CVS.
|
||||
* RefTeX: (reftex). Emacs support for LaTeX cross-references
|
||||
and citations.
|
||||
|
|
|
|||
|
|
@ -774,7 +774,6 @@ EXTRA_DIST += stdint.in.h
|
|||
## begin gnulib module stdio
|
||||
|
||||
BUILT_SOURCES += stdio.h
|
||||
libgnu_a_SOURCES += stdio.c
|
||||
|
||||
# We need the following in order to create <stdio.h> when the system
|
||||
# doesn't have one that works with the given compiler.
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
#include <config.h>
|
||||
#define _GL_STDIO_INLINE _GL_EXTERN_INLINE
|
||||
#include "stdio.h"
|
||||
|
|
@ -46,11 +46,6 @@
|
|||
#ifndef _@GUARD_PREFIX@_STDIO_H
|
||||
#define _@GUARD_PREFIX@_STDIO_H
|
||||
|
||||
_GL_INLINE_HEADER_BEGIN
|
||||
#ifndef _GL_STDIO_INLINE
|
||||
# define _GL_STDIO_INLINE _GL_INLINE
|
||||
#endif
|
||||
|
||||
/* Get va_list. Needed on many systems, including glibc 2.8. */
|
||||
#include <stdarg.h>
|
||||
|
||||
|
|
@ -580,21 +575,17 @@ _GL_CXXALIAS_RPL (fwrite, size_t,
|
|||
_GL_CXXALIAS_SYS (fwrite, size_t,
|
||||
(const void *ptr, size_t s, size_t n, FILE *stream));
|
||||
|
||||
/* Work around glibc bug 11959
|
||||
/* Work around bug 11959 when fortifying glibc 2.4 through 2.15
|
||||
<http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
|
||||
which sometimes causes an unwanted diagnostic for fwrite calls.
|
||||
This affects only function declaration attributes, so it's not
|
||||
needed for C++. */
|
||||
# if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL
|
||||
_GL_STDIO_INLINE size_t _GL_ARG_NONNULL ((1, 4))
|
||||
rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
|
||||
{
|
||||
size_t r = fwrite (ptr, s, n, stream);
|
||||
(void) r;
|
||||
return r;
|
||||
}
|
||||
This affects only function declaration attributes under certain
|
||||
versions of gcc, and is not needed for C++. */
|
||||
# if (0 < __USE_FORTIFY_LEVEL \
|
||||
&& __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
|
||||
&& 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \
|
||||
&& !defined __cplusplus)
|
||||
# undef fwrite
|
||||
# define fwrite rpl_fwrite
|
||||
# define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; })
|
||||
# endif
|
||||
# endif
|
||||
_GL_CXXALIASWARN (fwrite);
|
||||
|
|
@ -1338,8 +1329,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - "
|
|||
"POSIX compliance");
|
||||
#endif
|
||||
|
||||
_GL_INLINE_HEADER_END
|
||||
|
||||
#endif /* _@GUARD_PREFIX@_STDIO_H */
|
||||
#endif /* _@GUARD_PREFIX@_STDIO_H */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#else
|
||||
# include <config.h>
|
||||
# if FPRINTFTIME
|
||||
# include "ignore-value.h"
|
||||
# include "fprintftime.h"
|
||||
# else
|
||||
# include "strftime.h"
|
||||
|
|
@ -209,15 +208,7 @@ extern char *tzname[];
|
|||
else if (to_uppcase) \
|
||||
fwrite_uppcase (p, (s), _n); \
|
||||
else \
|
||||
{ \
|
||||
/* We are ignoring the value of fwrite here, in spite of the \
|
||||
fact that technically, that may not be valid: the fwrite \
|
||||
specification in POSIX 2008 defers to that of fputc, which \
|
||||
is intended to be consistent with the one from ISO C, \
|
||||
which permits failure due to ENOMEM *without* setting the \
|
||||
stream's error indicator. */ \
|
||||
ignore_value (fwrite ((s), _n, 1, p)); \
|
||||
} \
|
||||
fwrite (s, _n, 1, p); \
|
||||
} \
|
||||
while (0) \
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,59 @@
|
|||
2013-01-04 Daiki Ueno <ueno@gnu.org>
|
||||
|
||||
* epg.el: Silence byte-compiler warnings.
|
||||
(epg--start): Use delete-char instead of delete-backward-char.
|
||||
(epg-wait-for-completion): Pass FRAME arg to redraw-frame.
|
||||
|
||||
2013-01-04 Daiki Ueno <ueno@gnu.org>
|
||||
|
||||
* epg.el (epg--start): Don't call "tty" program on W32 platforms.
|
||||
Suggested by Eli Zaretskii <eliz@gnu.org>.
|
||||
|
||||
2013-01-04 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be
|
||||
non-negative integers. Otherwise, the default values are used.
|
||||
(tramp-convert-file-attributes): Convert uid and gid to integers.
|
||||
|
||||
2013-01-04 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* term.el (term-handle-colors-array): Ensure face attributes
|
||||
are fully specified, not nil. (Bug#13337)
|
||||
|
||||
* term.el (term-default-fg-color, term-default-bg-color):
|
||||
Fix custom type.
|
||||
|
||||
* progmodes/etags.el (tags-compression-info-list): Doc fix.
|
||||
(tag-find-file-of-tag-noselect): Check auto-compression-mode
|
||||
rather than 'jka-compr being loaded. (Bug#13338)
|
||||
|
||||
2013-01-04 Wesley Dawson <whd@lavabit.com> (tiny change)
|
||||
|
||||
* icomplete.el (icomplete-completions):
|
||||
Honor icomplete-prospects-height once more following
|
||||
2012-11-29 changes. (Bug#13224)
|
||||
|
||||
2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* subr.el (internal--called-interactively-p--get-frame): Find aliases
|
||||
of called-interactively-p as well (bug#13237).
|
||||
|
||||
* view.el (view--enable, view--disable): Rename from view-mode-enable
|
||||
and view-mode-disable and assume it's called from view-mode.
|
||||
(view-mode-enable, view-mode-disable): Redefine as obsolete
|
||||
compatibility layer above view-mode.
|
||||
(view-mode-enter): Call `view-mode'.
|
||||
|
||||
* files.el (after-find-file): Call `view-mode'.
|
||||
|
||||
* doc-view.el (doc-view-scale-internally): New var.
|
||||
(doc-view-enlarge, doc-view-insert-image): Obey it.
|
||||
|
||||
2013-01-03 Daiki Ueno <ueno@gnu.org>
|
||||
|
||||
* epg.el (epg--start): Ignore errors when /dev/fd/0 does not
|
||||
exist. (Bug#13344)
|
||||
|
||||
2013-01-03 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* mail/rmail.el (rmail-set-header-1): Ignore case.
|
||||
|
|
@ -338,6 +394,8 @@
|
|||
(lm-homepage): New function.
|
||||
(lm-with-file): Don't be confused if narrowing is in effect.
|
||||
|
||||
2012-12-19 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the
|
||||
very beginning of a hunk (e.g. killing the first line).
|
||||
|
||||
|
|
|
|||
|
|
@ -173,9 +173,17 @@ Higher values result in larger images."
|
|||
:type 'number
|
||||
:group 'doc-view)
|
||||
|
||||
(defcustom doc-view-scale-internally t
|
||||
"Whether we should try to rescale images ourselves.
|
||||
If nil, the document is re-rendered every time the scaling factor is modified.
|
||||
This only has an effect if the image libraries linked with Emacs support
|
||||
scaling."
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom doc-view-image-width 850
|
||||
"Default image width.
|
||||
Has only an effect if imagemagick support is compiled into emacs."
|
||||
Has only an effect if `doc-view-scale-internally' is non-nil and support for
|
||||
scaling is compiled into emacs."
|
||||
:version "24.1"
|
||||
:type 'number
|
||||
:group 'doc-view)
|
||||
|
|
@ -669,8 +677,9 @@ OpenDocument format)."
|
|||
(defun doc-view-enlarge (factor)
|
||||
"Enlarge the document by FACTOR."
|
||||
(interactive (list doc-view-shrink-factor))
|
||||
(if (eq (plist-get (cdr (doc-view-current-image)) :type)
|
||||
'imagemagick)
|
||||
(if (and doc-view-scale-internally
|
||||
(eq (plist-get (cdr (doc-view-current-image)) :type)
|
||||
'imagemagick))
|
||||
;; ImageMagick supports on-the-fly-rescaling.
|
||||
(let ((new (ceiling (* factor doc-view-image-width))))
|
||||
(unless (equal new doc-view-image-width)
|
||||
|
|
@ -1133,10 +1142,11 @@ ARGS is a list of image descriptors."
|
|||
(setq doc-view-pending-cache-flush nil))
|
||||
(let ((ol (doc-view-current-overlay))
|
||||
(image (if (and file (file-readable-p file))
|
||||
(if (not (fboundp 'imagemagick-types))
|
||||
(if (not (and doc-view-scale-internally
|
||||
(fboundp 'imagemagick-types)))
|
||||
(apply 'create-image file 'png nil args)
|
||||
(unless (member :width args)
|
||||
(setq args (append args (list :width doc-view-image-width))))
|
||||
(setq args `(,@args :width ,doc-view-image-width)))
|
||||
(apply 'create-image file 'imagemagick nil args))))
|
||||
(slice (doc-view-current-slice)))
|
||||
(setf (doc-view-current-image) image)
|
||||
|
|
|
|||
13
lisp/epg.el
13
lisp/epg.el
|
|
@ -1166,10 +1166,13 @@ This function is for internal use only."
|
|||
;; Set GPG_TTY and TERM for pinentry-curses. Note that we can't
|
||||
;; use `terminal-name' here to get the real pty name for the child
|
||||
;; process, though /dev/fd/0" is not portable.
|
||||
(with-temp-buffer
|
||||
(when (= (call-process "tty" "/dev/fd/0" t) 0)
|
||||
(delete-backward-char 1)
|
||||
(setq terminal-name (buffer-string))))
|
||||
(unless (memq system-type '(ms-dos windows-nt))
|
||||
(with-temp-buffer
|
||||
(condition-case nil
|
||||
(when (= (call-process "tty" "/dev/fd/0" t) 0)
|
||||
(delete-char -1)
|
||||
(setq terminal-name (buffer-string)))
|
||||
(file-error))))
|
||||
(when terminal-name
|
||||
(setq process-environment
|
||||
(cons (concat "GPG_TTY=" terminal-name)
|
||||
|
|
@ -1297,7 +1300,7 @@ This function is for internal use only."
|
|||
(> (float-time (or (nth 5 (file-attributes epg-agent-file))
|
||||
'(0 0 0 0)))
|
||||
(float-time epg-agent-mtime))))
|
||||
(redraw-frame))
|
||||
(redraw-frame (selected-frame)))
|
||||
(epg-context-set-result-for
|
||||
context 'error
|
||||
(nreverse (epg-context-result-for context 'error))))
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2013-01-04 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* erc-backend.el (312): Fix typo. (Bug#13235)
|
||||
|
||||
2012-11-30 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* erc.el (erc-accidental-paste-threshold-seconds): Add :version.
|
||||
|
|
|
|||
|
|
@ -1633,8 +1633,8 @@ See `erc-display-server-message'." nil
|
|||
|
||||
(define-erc-response-handler (312)
|
||||
"Server name response in WHOIS." nil
|
||||
(pcase-let ((`(,nick ,server-host))
|
||||
(cdr (erc-response.command-args parsed)))
|
||||
(pcase-let ((`(,nick ,server-host)
|
||||
(cdr (erc-response.command-args parsed))))
|
||||
(erc-display-message
|
||||
parsed 'notice 'active 's312
|
||||
?n nick ?s server-host ?c (erc-response.contents parsed))))
|
||||
|
|
|
|||
|
|
@ -209,7 +209,6 @@ have fast storage with limited space, such as a RAM disk."
|
|||
(declare-function dired-unmark "dired" (arg))
|
||||
(declare-function dired-do-flagged-delete "dired" (&optional nomessage))
|
||||
(declare-function dos-8+3-filename "dos-fns" (filename))
|
||||
(declare-function view-mode-disable "view" ())
|
||||
(declare-function dosified-file-name "dos-fns" (file-name))
|
||||
|
||||
(defvar file-name-invalid-regexp
|
||||
|
|
@ -2125,7 +2124,7 @@ unless NOMODES is non-nil."
|
|||
(setq buffer-read-only t))
|
||||
(unless nomodes
|
||||
(when (and view-read-only view-mode)
|
||||
(view-mode-disable))
|
||||
(view-mode -1))
|
||||
(normal-mode t)
|
||||
;; If requested, add a newline at the end of the file.
|
||||
(and (memq require-final-newline '(visit visit-save))
|
||||
|
|
|
|||
|
|
@ -343,8 +343,10 @@ are exhibited within the square braces.)"
|
|||
(t (concat "…" (substring most compare))))
|
||||
close-bracket)))
|
||||
;;"-prospects" - more than one candidate
|
||||
(prospects-len (+ (length determ) 6 ;; take {,...} into account
|
||||
(string-width (buffer-string))))
|
||||
(prospects-len (+ (length determ)
|
||||
(string-width icomplete-separator)
|
||||
3 ;; take {…} into account
|
||||
(string-width (buffer-string))))
|
||||
(prospects-max
|
||||
;; Max total length to use, including the minibuffer content.
|
||||
(* (+ icomplete-prospects-height
|
||||
|
|
@ -375,7 +377,9 @@ are exhibited within the square braces.)"
|
|||
(cond ((string-equal comp "") (setq most-is-exact t))
|
||||
((member comp prospects))
|
||||
(t (setq prospects-len
|
||||
(+ (string-width comp) 1 prospects-len))
|
||||
(+ (string-width comp)
|
||||
(string-width icomplete-separator)
|
||||
prospects-len))
|
||||
(if (< prospects-len prospects-max)
|
||||
(push comp prospects)
|
||||
(setq limit t))))))
|
||||
|
|
|
|||
|
|
@ -1452,23 +1452,22 @@ of."
|
|||
(defun tramp-set-file-uid-gid (filename &optional uid gid)
|
||||
"Set the ownership for FILENAME.
|
||||
If UID and GID are provided, these values are used; otherwise uid
|
||||
and gid of the corresponding user is taken. Both parameters must be integers."
|
||||
and gid of the corresponding user is taken. Both parameters must
|
||||
be non-negative integers."
|
||||
;; Modern Unices allow chown only for root. So we might need
|
||||
;; another implementation, see `dired-do-chown'. OTOH, it is mostly
|
||||
;; 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)
|
||||
(uid (and (numberp uid) (round uid)))
|
||||
(gid (and (numberp gid) (round gid))))
|
||||
(let ((last-coding-system-used last-coding-system-used))
|
||||
(if (file-remote-p filename)
|
||||
(with-parsed-tramp-file-name filename nil
|
||||
(if (and (zerop (user-uid)) (tramp-local-host-p v))
|
||||
;; If we are root on the local host, we can do it directly.
|
||||
(tramp-set-file-uid-gid localname uid gid)
|
||||
(let ((uid (or (and (integerp uid) uid)
|
||||
(let ((uid (or (and (natnump uid) uid)
|
||||
(tramp-get-remote-uid v 'integer)))
|
||||
(gid (or (and (integerp gid) gid)
|
||||
(gid (or (and (natnump gid) gid)
|
||||
(tramp-get-remote-gid v 'integer))))
|
||||
(tramp-send-command
|
||||
v (format
|
||||
|
|
@ -1477,8 +1476,8 @@ and gid of the corresponding user is taken. Both parameters must be integers."
|
|||
|
||||
;; We handle also the local part, because there doesn't exist
|
||||
;; `set-file-uid-gid'. On W32 "chown" might not work.
|
||||
(let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
|
||||
(gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
|
||||
(let ((uid (or (and (natnump uid) uid) (tramp-get-local-uid 'integer)))
|
||||
(gid (or (and (natnump gid) gid) (tramp-get-local-gid 'integer))))
|
||||
(tramp-compat-call-process
|
||||
"chown" nil nil nil
|
||||
(format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
|
||||
|
|
@ -4665,7 +4664,7 @@ raises an error."
|
|||
command (buffer-string))))))))
|
||||
|
||||
(defun tramp-convert-file-attributes (vec attr)
|
||||
"Convert file-attributes ATTR generated by perl script, stat or ls.
|
||||
"Convert `file-attributes' ATTR generated by perl script, stat or ls.
|
||||
Convert file mode bits to string and set virtual device number.
|
||||
Return ATTR."
|
||||
(when attr
|
||||
|
|
@ -4673,6 +4672,17 @@ Return ATTR."
|
|||
(when (stringp (car attr))
|
||||
(while (string-match tramp-color-escape-sequence-regexp (car attr))
|
||||
(setcar attr (replace-match "" nil nil (car attr)))))
|
||||
;; Convert uid and gid. Use -1 as indication of unusable value.
|
||||
(when (and (numberp (nth 2 attr)) (< (nth 2 attr) 0))
|
||||
(setcar (nthcdr 2 attr) -1))
|
||||
(when (and (floatp (nth 2 attr))
|
||||
(<= (nth 2 attr) (tramp-compat-most-positive-fixnum)))
|
||||
(setcar (nthcdr 2 attr) (round (nth 2 attr))))
|
||||
(when (and (numberp (nth 3 attr)) (< (nth 3 attr) 0))
|
||||
(setcar (nthcdr 3 attr) -1))
|
||||
(when (and (floatp (nth 3 attr))
|
||||
(<= (nth 3 attr) (tramp-compat-most-positive-fixnum)))
|
||||
(setcar (nthcdr 3 attr) (round (nth 3 attr))))
|
||||
;; Convert last access time.
|
||||
(unless (listp (nth 4 attr))
|
||||
(setcar (nthcdr 4 attr)
|
||||
|
|
|
|||
|
|
@ -67,11 +67,8 @@ Use the `etags' program to make a tags table file."
|
|||
;;;###autoload
|
||||
(defcustom tags-compression-info-list
|
||||
(purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
|
||||
"List of extensions tried by etags when jka-compr is used.
|
||||
An empty string means search the non-compressed file.
|
||||
These extensions will be tried only if jka-compr was activated
|
||||
\(i.e. via customize of `auto-compression-mode' or by calling the function
|
||||
`auto-compression-mode')."
|
||||
"List of extensions tried by etags when `auto-compression-mode' is on.
|
||||
An empty string means search the non-compressed file."
|
||||
:version "24.1" ; added xz
|
||||
:type '(repeat string)
|
||||
:group 'etags)
|
||||
|
|
@ -1182,7 +1179,7 @@ error message."
|
|||
"Find the right line in the specified FILE."
|
||||
;; If interested in compressed-files, search files with extensions.
|
||||
;; Otherwise, search only the real file.
|
||||
(let* ((buffer-search-extensions (if (featurep 'jka-compr)
|
||||
(let* ((buffer-search-extensions (if auto-compression-mode
|
||||
tags-compression-info-list
|
||||
'("")))
|
||||
the-buffer
|
||||
|
|
@ -1206,7 +1203,7 @@ error message."
|
|||
(setq file-search-extensions (cdr file-search-extensions))
|
||||
(setq the-buffer (find-file-noselect (concat file (car file-search-extensions))))))
|
||||
(if (not the-buffer)
|
||||
(if (featurep 'jka-compr)
|
||||
(if auto-compression-mode
|
||||
(error "File %s (with or without extensions %s) not found" file tags-compression-info-list)
|
||||
(error "File %s not found" file))
|
||||
(set-buffer the-buffer))))
|
||||
|
|
|
|||
|
|
@ -3977,8 +3977,8 @@ the number of frames to skip (minus 1).")
|
|||
`(progn
|
||||
(defvar ,sym
|
||||
(let ((i 1))
|
||||
(while (not (eq (nth 1 (backtrace-frame i))
|
||||
'called-interactively-p))
|
||||
(while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t)
|
||||
(indirect-function 'called-interactively-p)))
|
||||
(setq i (1+ i)))
|
||||
i))
|
||||
;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p)
|
||||
|
|
|
|||
18
lisp/term.el
18
lisp/term.el
|
|
@ -778,14 +778,14 @@ Buffer local variable.")
|
|||
(defcustom term-default-fg-color nil
|
||||
"If non-nil, default color for foreground in Term mode."
|
||||
:group 'term
|
||||
:type 'string)
|
||||
:type '(choice (const nil) (string :tag "color")))
|
||||
(make-obsolete-variable 'term-default-fg-color "use the face `term' instead."
|
||||
"24.3")
|
||||
|
||||
(defcustom term-default-bg-color nil
|
||||
"If non-nil, default color for foreground in Term mode."
|
||||
:group 'term
|
||||
:type 'string)
|
||||
:type '(choice (const nil) (string :tag "color")))
|
||||
(make-obsolete-variable 'term-default-bg-color "use the face `term' instead."
|
||||
"24.3")
|
||||
|
||||
|
|
@ -3222,18 +3222,24 @@ See `term-prompt-regexp'."
|
|||
(let ((color
|
||||
(if term-ansi-current-reverse
|
||||
(face-foreground
|
||||
(elt ansi-term-color-vector term-ansi-current-color))
|
||||
(elt ansi-term-color-vector term-ansi-current-color)
|
||||
nil 'default)
|
||||
(face-background
|
||||
(elt ansi-term-color-vector term-ansi-current-bg-color)))))
|
||||
(elt ansi-term-color-vector term-ansi-current-bg-color)
|
||||
nil 'default))))
|
||||
(setq term-current-face
|
||||
(list :background color
|
||||
:foreground color))
|
||||
) ;; No need to bother with anything else if it's invisible.
|
||||
(setq term-current-face
|
||||
(list :foreground
|
||||
(face-foreground (elt ansi-term-color-vector term-ansi-current-color))
|
||||
(face-foreground
|
||||
(elt ansi-term-color-vector term-ansi-current-color)
|
||||
nil 'default)
|
||||
:background
|
||||
(face-background (elt ansi-term-color-vector term-ansi-current-bg-color))
|
||||
(face-background
|
||||
(elt ansi-term-color-vector term-ansi-current-bg-color)
|
||||
nil 'default)
|
||||
:inverse-video term-ansi-current-reverse))
|
||||
|
||||
(when term-ansi-current-bold
|
||||
|
|
|
|||
34
lisp/view.el
34
lisp/view.el
|
|
@ -461,16 +461,13 @@ then \\[View-leave], \\[View-quit] and \\[View-kill-and-leave] will return to th
|
|||
|
||||
Entry to view-mode runs the normal hook `view-mode-hook'."
|
||||
:lighter " View" :keymap view-mode-map
|
||||
(if view-mode (view-mode-enable) (view-mode-disable)))
|
||||
(if view-mode (view--enable) (view--disable)))
|
||||
|
||||
(defun view-mode-enable (&optional run-view-mode-hook)
|
||||
"Turn on View mode.
|
||||
Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
|
||||
(defun view--enable ()
|
||||
;; Always leave view mode before changing major mode.
|
||||
;; This is to guarantee that the buffer-read-only variable is restored.
|
||||
(add-hook 'change-major-mode-hook 'view-mode-disable nil t)
|
||||
(setq view-mode t
|
||||
view-page-size nil
|
||||
(add-hook 'change-major-mode-hook 'view--disable nil t)
|
||||
(setq view-page-size nil
|
||||
view-half-page-size nil
|
||||
view-old-buffer-read-only buffer-read-only
|
||||
buffer-read-only t)
|
||||
|
|
@ -481,16 +478,18 @@ Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
|
|||
(format "continue viewing %s"
|
||||
(if (buffer-file-name)
|
||||
(file-name-nondirectory (buffer-file-name))
|
||||
(buffer-name)))))
|
||||
(force-mode-line-update)
|
||||
(when run-view-mode-hook
|
||||
(run-hooks 'view-mode-hook)))
|
||||
(buffer-name))))))
|
||||
|
||||
|
||||
(define-obsolete-function-alias 'view-mode-enable 'view-mode "24.4")
|
||||
(defun view-mode-disable ()
|
||||
"Turn off View mode."
|
||||
(remove-hook 'change-major-mode-hook 'view-mode-disable t)
|
||||
(declare (obsolete view-mode "24.4"))
|
||||
(view-mode -1))
|
||||
|
||||
(defun view--disable ()
|
||||
(remove-hook 'change-major-mode-hook 'view--disable t)
|
||||
(and view-overlay (delete-overlay view-overlay))
|
||||
(force-mode-line-update)
|
||||
;; Calling toggle-read-only while View mode is enabled
|
||||
;; sets view-read-only to t as a buffer-local variable
|
||||
;; after exiting View mode. That arranges that the next toggle-read-only
|
||||
|
|
@ -499,7 +498,6 @@ Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
|
|||
;; so that View mode stays off if toggle-read-only is called.
|
||||
(if (local-variable-p 'view-read-only)
|
||||
(kill-local-variable 'view-read-only))
|
||||
(setq view-mode nil)
|
||||
(if (boundp 'Helper-return-blurb)
|
||||
(setq Helper-return-blurb view-old-Helper-return-blurb))
|
||||
(if buffer-read-only
|
||||
|
|
@ -562,8 +560,7 @@ This function runs the normal hook `view-mode-hook'."
|
|||
(setq view-exit-action exit-action))
|
||||
|
||||
(unless view-mode
|
||||
(view-mode-enable t)
|
||||
(force-mode-line-update)
|
||||
(view-mode 1)
|
||||
(unless view-inhibit-help-message
|
||||
(message "%s"
|
||||
(substitute-command-keys "\
|
||||
|
|
@ -590,7 +587,7 @@ current buffer. "
|
|||
(when view-mode
|
||||
(let ((buffer (window-buffer)))
|
||||
(unless view-no-disable-on-exit
|
||||
(view-mode-disable))
|
||||
(view-mode -1))
|
||||
|
||||
(unless exit-only
|
||||
(cond
|
||||
|
|
@ -601,8 +598,7 @@ current buffer. "
|
|||
(quit-window)))
|
||||
|
||||
(when exit-action
|
||||
(funcall exit-action buffer))
|
||||
(force-mode-line-update)))))
|
||||
(funcall exit-action buffer))))))
|
||||
|
||||
(defun View-exit ()
|
||||
"Exit View mode but stay in current buffer."
|
||||
|
|
|
|||
|
|
@ -712,7 +712,6 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
lib/stdbool.in.h
|
||||
lib/stddef.in.h
|
||||
lib/stdint.in.h
|
||||
lib/stdio.c
|
||||
lib/stdio.in.h
|
||||
lib/stdlib.in.h
|
||||
lib/strftime.c
|
||||
|
|
|
|||
|
|
@ -1,3 +1,19 @@
|
|||
2013-01-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* nsterm.m (ns_draw_underwave):
|
||||
* w32term.c (w32_draw_underwave):
|
||||
* xterm.c (x_draw_underwave): Make underwave look more triangular
|
||||
and also degrade gracefully for small fonts. (Bug#13000)
|
||||
|
||||
* nsterm.m (ns_draw_text_decoration):
|
||||
* w32term.c (x_draw_glyph_string):
|
||||
* xterm.c (x_draw_glyph_string): Don't use previous underline
|
||||
thickness and position if previous underline type is underwave.
|
||||
|
||||
2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* fileio.c (Ffile_acl): Undocument return format.
|
||||
|
||||
2013-01-02 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* keymap.c (Fkey_description): Doc fix. (Bug#13323)
|
||||
|
|
@ -257,7 +273,7 @@
|
|||
|
||||
* xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove.
|
||||
(redisplay_internal): Don't bother selecting the frame to get the
|
||||
proper value of frame-local variables.
|
||||
proper value of frame-local variables (bug#13225).
|
||||
|
||||
2012-12-20 Dmitry Antipov <dmantipov@yandex.ru>
|
||||
|
||||
|
|
|
|||
|
|
@ -3084,11 +3084,11 @@ or if Emacs was not compiled with SELinux support. */)
|
|||
}
|
||||
|
||||
DEFUN ("file-acl", Ffile_acl, Sfile_acl, 1, 1, 0,
|
||||
doc: /* Return ACL entries of file named FILENAME, as a string.
|
||||
doc: /* Return ACL entries of file named FILENAME.
|
||||
The entries are returned in a format suitable for use in `set-file-acl'
|
||||
but is otherwise undocumented and subject to change.
|
||||
Return nil if file does not exist or is not accessible, or if Emacs
|
||||
was unable to determine the ACL entries. The latter can happen for
|
||||
local files if Emacs was not compiled with ACL support, or for remote
|
||||
files if the file handler returns nil for the file's ACL entries. */)
|
||||
was unable to determine the ACL entries. */)
|
||||
(Lisp_Object filename)
|
||||
{
|
||||
Lisp_Object absname;
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Other values of LIMIT are ignored. */)
|
|||
before it's time to do a QUIT. This must be a power of 2. */
|
||||
enum { QUIT_COUNT_HEURISTIC = 1 << 16 };
|
||||
|
||||
/* Random data-structure functions */
|
||||
/* Random data-structure functions. */
|
||||
|
||||
DEFUN ("length", Flength, Slength, 1, 1, 0,
|
||||
doc: /* Return the length of vector, list or string SEQUENCE.
|
||||
|
|
|
|||
13
src/nsterm.m
13
src/nsterm.m
|
|
@ -2566,7 +2566,7 @@ ns_get_glyph_string_clip_rect (struct glyph_string *s, NativeRectangle *nr)
|
|||
Draw a wavy line under glyph string s. The wave fills wave_height
|
||||
pixels from y.
|
||||
|
||||
x wave_length = 3
|
||||
x wave_length = 2
|
||||
--
|
||||
y * * * * *
|
||||
|* * * * * * * * *
|
||||
|
|
@ -2576,14 +2576,14 @@ ns_get_glyph_string_clip_rect (struct glyph_string *s, NativeRectangle *nr)
|
|||
static void
|
||||
ns_draw_underwave (struct glyph_string *s, CGFloat width, CGFloat x)
|
||||
{
|
||||
int wave_height = 3, wave_length = 3;
|
||||
int wave_height = 3, wave_length = 2;
|
||||
int y, dx, dy, odd, xmax;
|
||||
NSPoint a, b;
|
||||
NSRect waveClip;
|
||||
|
||||
dx = wave_length;
|
||||
dy = wave_height - 1;
|
||||
y = s->ybase + 1;
|
||||
y = s->ybase - wave_height + 3;
|
||||
xmax = x + width;
|
||||
|
||||
/* Find and set clipping rectangle */
|
||||
|
|
@ -2592,10 +2592,10 @@ ns_draw_underwave (struct glyph_string *s, CGFloat width, CGFloat x)
|
|||
NSRectClip (waveClip);
|
||||
|
||||
/* Draw the waves */
|
||||
a.x = x - ((int)(x) % dx);
|
||||
a.x = x - ((int)(x) % dx) + 0.5;
|
||||
b.x = a.x + dx;
|
||||
odd = (int)(a.x/dx) % 2;
|
||||
a.y = b.y = y;
|
||||
a.y = b.y = y + 0.5;
|
||||
|
||||
if (odd)
|
||||
a.y += dy;
|
||||
|
|
@ -2606,7 +2606,7 @@ ns_draw_underwave (struct glyph_string *s, CGFloat width, CGFloat x)
|
|||
{
|
||||
[NSBezierPath strokeLineFromPoint:a toPoint:b];
|
||||
a.x = b.x, a.y = b.y;
|
||||
b.x += dx, b.y = y + odd*dy;
|
||||
b.x += dx, b.y = y + 0.5 + odd*dy;
|
||||
odd = !odd;
|
||||
}
|
||||
|
||||
|
|
@ -2646,6 +2646,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
|
|||
|
||||
/* If the prev was underlined, match its appearance. */
|
||||
if (s->prev && s->prev->face->underline_p
|
||||
&& s->prev->face->underline_type == FACE_UNDER_LINE
|
||||
&& s->prev->underline_thickness > 0)
|
||||
{
|
||||
thickness = s->prev->underline_thickness;
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ w32_restore_glyph_string_clip (struct glyph_string *s)
|
|||
void
|
||||
w32_draw_underwave (struct glyph_string *s, COLORREF color)
|
||||
{
|
||||
int wave_height = 2, wave_length = 3;
|
||||
int wave_height = 3, wave_length = 2;
|
||||
int dx, dy, x0, y0, width, x1, y1, x2, y2, odd, xmax;
|
||||
XRectangle wave_clip, string_clip, final_clip;
|
||||
RECT w32_final_clip, w32_string_clip;
|
||||
|
|
@ -367,7 +367,7 @@ w32_draw_underwave (struct glyph_string *s, COLORREF color)
|
|||
dx = wave_length;
|
||||
dy = wave_height - 1;
|
||||
x0 = s->x;
|
||||
y0 = s->ybase + 1;
|
||||
y0 = s->ybase - wave_height + 3;
|
||||
width = s->width;
|
||||
xmax = x0 + width;
|
||||
|
||||
|
|
@ -2456,7 +2456,8 @@ x_draw_glyph_string (struct glyph_string *s)
|
|||
unsigned long thickness, position;
|
||||
int y;
|
||||
|
||||
if (s->prev && s->prev->face->underline_p)
|
||||
if (s->prev && s->prev->face->underline_p
|
||||
&& s->prev->face->underline_type == FACE_UNDER_LINE)
|
||||
{
|
||||
/* We use the same underline style as the previous one. */
|
||||
thickness = s->prev->underline_thickness;
|
||||
|
|
|
|||
|
|
@ -2634,14 +2634,14 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
|
|||
static void
|
||||
x_draw_underwave (struct glyph_string *s)
|
||||
{
|
||||
int wave_height = 2, wave_length = 3;
|
||||
int wave_height = 3, wave_length = 2;
|
||||
int dx, dy, x0, y0, width, x1, y1, x2, y2, odd, xmax;
|
||||
XRectangle wave_clip, string_clip, final_clip;
|
||||
|
||||
dx = wave_length;
|
||||
dy = wave_height - 1;
|
||||
x0 = s->x;
|
||||
y0 = s->ybase + 1;
|
||||
y0 = s->ybase - wave_height + 3;
|
||||
width = s->width;
|
||||
xmax = x0 + width;
|
||||
|
||||
|
|
@ -2809,7 +2809,8 @@ x_draw_glyph_string (struct glyph_string *s)
|
|||
unsigned long thickness, position;
|
||||
int y;
|
||||
|
||||
if (s->prev && s->prev->face->underline_p)
|
||||
if (s->prev && s->prev->face->underline_p
|
||||
&& s->prev->face->underline_type == FACE_UNDER_LINE)
|
||||
{
|
||||
/* We use the same underline style as the previous one. */
|
||||
thickness = s->prev->underline_thickness;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,18 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running
|
|||
|
||||
# adsgsdg
|
||||
|
||||
case $X in
|
||||
foo)
|
||||
do_something
|
||||
;;
|
||||
arg=*) # bug#12953
|
||||
do_something_else_based_on_arg
|
||||
;;
|
||||
*)
|
||||
default
|
||||
;;
|
||||
esac
|
||||
|
||||
echo -n $(( 5 << 2 ))
|
||||
# This should not be treated as a heredoc (bug#12770).
|
||||
2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue