procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Browse source 
Conflicts:
	lisp/ChangeLog
This commit is contained in:
Michael Albinus 2014-11-13 16:29:20 +01:00
commit d856e6b0d8
7 changed files with 77 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
.gitignore vendored
View file

@ -22,3 +22,50 @@ etc/refcards/*.log
info/dir
info/*.info
test/biditest.txt
Makefile
config.log
config.status
lib-src/ctags
lib-src/ebrowse
lib-src/emacsclient
lib-src/etags
lib-src/hexl
lib-src/make-docfile
lib-src/movemail
lib-src/profile
lib-src/update-game-score
*.o
lib/alloca.h
lib/arg-nonnull.h
lib/c++defs.h
lib/dirent.h
lib/fcntl.h
lib/getopt.h
lib/inttypes.h
lib/libgnu.a
lib/signal.h
lib/stdio.h
lib/stdlib.h
lib/string.h
lib/sys/
lib/time.h
lib/unistd.h
lib/warn-on-use.h
src/bootstrap-emacs
src/deps/
src/emacs
src/emacs-25.0.50.1
src/emacs-25.0.50.2
src/gl-stamp
src/globals.h
src/stamp-h1
src/temacs
doc/emacs/emacsver.texi
doc/man/emacs.1
etc/refcards/emacsver.tex
lib/.deps/
lisp/international/uni-brackets.el
lwlib/deps/
lwlib/liblw.a

6
ChangeLog
View file

@ -1,3 +1,9 @@
2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* .gitignore: Copy over sufficient ignorable files from the old
.bzrignore that a simple build doesn't list lots of unregistered
files.
2014-11-11 Eric S. Raymond <esr@thyrsus.com>
* Makefile.in: git transition - set VCWITNESS appropriately for git.

8
lisp/ChangeLog
View file

@ -2,6 +2,14 @@
* vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940)
2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-form-file): Fix version number.
2014-11-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.
2014-11-10 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>
* net/eww.el(eww-form-file(defface)): New defface of file upload form.

2
lisp/gnus/mml2015.el
View file

@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
(defcustom mml2015-display-key-image t
"If t, try to display key images."
:version "25.1"
:version "24.5"
:group 'mime-security
:type 'boolean)

5
lisp/net/eww.el
View file

@ -105,9 +105,8 @@ See also `eww-form-checkbox-selected-symbol'."
:box (:line-width 2 :style released-button)
:background "#808080" :foreground "black"))
"Face for eww buffer buttons."
:version "24.4"
:group 'eww
:type "Browse")
:version "25.1"
:group 'eww)
(defface eww-form-checkbox
'((((type x w32 ns) (class color)) ; Like default mode line

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2014-11-13 Paul Eggert <eggert@cs.ucla.edu>
Avoid undefined behavior in color table hashing.
* image.c (CT_HASH_RGB) [COLOR_TABLE_SUPPORT]: Remove, replacing with ...
(ct_hash_rgb) [COLOR_TABLE_SUPPORT]: New function. All uses changed.
This function avoids undefined behavior with signed shift overflow.
2014-11-10 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Finsert_file_contents): Invalidate buffer caches also

8
src/image.c
View file

@ -4294,7 +4294,11 @@ struct ct_color
/* Value is a hash of the RGB color given by R, G, and B. */
#define CT_HASH_RGB(R, G, B) (((R) << 16) ^ ((G) << 8) ^ (B))
static unsigned
ct_hash_rgb (unsigned r, unsigned g, unsigned b)
{
return (r << 16) ^ (g << 8) ^ b;
}
/* The color hash table. */
@ -4349,7 +4353,7 @@ free_color_table (void)
static unsigned long
lookup_rgb_color (struct frame *f, int r, int g, int b)
{
unsigned hash = CT_HASH_RGB (r, g, b);
unsigned hash = ct_hash_rgb (r, g, b);
int i = hash % CT_SIZE;
struct ct_color *p;
Display_Info *dpyinfo;