mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Merge from origin/emacs-26

Browse Source 
5381c70b7a In windows.texi mention special splitting behavior of side...
46d62b9f36 * lisp/gnus/gnus-group.el (gnus-group-mode-map): Bind [fol...
1ef1dbdbc5 Avoid compilation warning in xterm.c
5cf3c26f2d * README: Document all the top-level directories.  (Bug#29...
e9ea2065a8 Don't enable erc modules on simply loading erc.el
This commit is contained in:
Michael Albinus 2017-12-09 10:13:02 +01:00
commit 0667d7a160
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -72,6 +72,8 @@ There are several subdirectories:
'lib' holds source code for libraries used by Emacs and its utilities
'lib-src' holds the source code for some utility programs for use by or
with Emacs, like movemail and etags.
'lwlib' holds the sources of the Lucid Widget Library used on X.
'oldXMenu' source files from X11R2 XMenu library, used in non-toolkit builds.
'etc' holds miscellaneous architecture-independent data files Emacs
uses, like the tutorial text and tool bar images.
The contents of the 'lisp', 'leim', 'info', and 'doc'
@ -89,6 +91,10 @@ There are several subdirectories:
Nextstep port of Emacs, for GNUstep and macOS Cocoa.
'nt' holds code and documentation for building Emacs on MS-Windows.
'test' holds tests for various aspects of Emacs's functionality.
'modules' holds the modhelp.py helper script.
'admin' holds files used by Emacs developers, and Unicode data files.
'build-aux' holds auxiliary files used during the build.
'm4' holds Autoconf macros used for generating the configure script.
Building Emacs on non-Posix platforms requires tools that aren't part
of the standard distribution of the OS. The platform-specific README

5
doc/lispref/windows.texi
View File

@ -1109,7 +1109,10 @@ the size of @var{window} is not preserved.
@cindex window splitting
This section describes functions for creating a new window by
@dfn{splitting} an existing one.
@dfn{splitting} an existing one. Note that some windows are special in
the sense that these functions may fail to split them as described here.
Examples of such windows are side windows (@pxref{Side Windows}) and
atomic windows (@pxref{Atomic Windows}).
@defun split-window &optional window size side pixelwise
This function creates a new live window next to the window

1
lisp/erc/erc.el
View File

@ -1850,6 +1850,7 @@ removed from the list will be disabled."
:get (lambda (sym)
;; replace outdated names with their newer equivalents
(erc-migrate-modules (symbol-value sym)))
:initialize 'custom-initialize-default
:set (lambda (sym val)
;; disable modules which have just been removed
(when (and (boundp 'erc-modules) erc-modules val)

2
lisp/gnus/gnus-group.el
View File

@ -628,7 +628,7 @@ simple manner."
"\M-e" gnus-group-edit-group-method
"^" gnus-group-enter-server-mode
[mouse-2] gnus-mouse-pick-group
[follow-link] 'mouse-face
[follow-link] mouse-face
"<" beginning-of-buffer
">" end-of-buffer
"\C-c\C-b" gnus-bug

4
src/xterm.c
View File

@ -3517,13 +3517,13 @@ x_draw_underwave (struct glyph_string *s)
x_get_scale_factor (s->display, &scale_x, &scale_y);
int wave_height = 3 * scale_y, wave_length = 2 * scale_x, thickness = scale_y;
int wave_height = 3 * scale_y, wave_length = 2 * scale_x;
#ifdef USE_CAIRO
x_draw_horizontal_wave (s->f, s->gc, s->x, s->ybase - wave_height + 3,
s->width, wave_height, wave_length);
#else /* not USE_CAIRO */
int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax;
int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax, thickness = scale_y;;
bool odd;
XRectangle wave_clip, string_clip, final_clip;