Commit ba4502fe authored by Ted Zlatanov's avatar Ted Zlatanov
Browse files

Merge branch 'emacs-24'

Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
parents b121ef10 81e0cca7
......@@ -3,7 +3,9 @@
(fill-column . 70)))
(c-mode . ((c-file-style . "GNU")))
(objc-mode . ((c-file-style . "GNU")))
(log-edit-mode . ((log-edit-font-lock-gnu-style . t)
(log-edit-mode . ((log-edit-rewrite-fixes
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
(log-edit-font-lock-gnu-style . t)
(log-edit-setup-add-author . t)))
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
......
**/Makefile
**/makefile
configure
aclocal.m4
compile
......@@ -9,7 +12,6 @@ missing
lib/Makefile.in
src/config.in
autom4te.cache
makefile
TAGS
*~
.#*
......@@ -24,7 +26,6 @@ info/dir
info/*.info
test/biditest.txt
Makefile
config.log
config.status
config.cache
......@@ -72,9 +73,38 @@ src/stamp-h1
src/temacs
src/temacs.map
src/temacs.tmp
doc/emacs/emacsver.texi
doc/man/emacs.1
etc/refcards/emacsver.tex
doc/*/*.aux
doc/*/*.cm
doc/*/*.cms
doc/*/*.cp
doc/*/*.cps
doc/*/*.dvi
doc/*/*.fn
doc/*/*.fns
doc/*/*.html
doc/*/*.ky
doc/*/*.kys
doc/*/*.log
doc/*/*.op
doc/*/*.ops
doc/*/*.pdf
doc/*/*.pg
doc/*/*.pgs
doc/*/*.pj
doc/*/*.pjs
doc/*/*.ps
doc/*/*.sc
doc/*/*.scs
doc/*/*.tg
doc/*/*.tgs
doc/*/*.tmp
doc/*/*.toc
doc/*/*.tp
doc/*/*.tps
doc/*/*.vr
doc/*/*.vrs
doc/*/texput.log
doc/misc/cc-mode.ss
lib/.deps/
lisp/international/uni-brackets.el
lwlib/deps/
......
2014-11-17 Paul Eggert <eggert@cs.ucla.edu>
Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
* .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
Simplify and fix doc-related .gitignore files.
This fixes some unwanted 'git status' output after 'make docs'.
* .gitignore: Add **/Makefile, **/makefile.
Remove Makefile, makefile.
Add doc/*/*.xxx rules for the usual kinds of documentation outputs
and temporaries. Add doc/misc/cc-mode.ss.
* doc/emacs/.gitignore, doc/lispintro/.gitignore, doc/misc/.gitignore:
* lwlib/.gitignore, oldXMenu/.gitignore:
Remove, as these .gitignore files are no longer needed.
* doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
2014-11-26 Dani Moncayo <dmoncayo@gmail.com>
* configure.ac [MINGW]: Fix the way of getting the right host
......
......@@ -19,8 +19,9 @@ __MSDOS__ Ditto.
__DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c.
DOS_NT Compiling for either the MS-DOS or native MS-Windows port.
WINDOWSNT Compiling the native MS-Windows (W32) port.
__MINGW32__ Compiling the W32 port with the MinGW port of GCC.
__MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
_MSC_VER Compiling the W32 port with the Microsoft C compiler.
MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC.
DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
SOLARIS2
USG
......
2014-11-17 Oscar Fuentes <ofv@wanadoo.es>
* admin/CPP-DEFINES: Mention MINGW_W64.
2014-11-22 Glenn Morris <rgm@gnu.org>
* admin.el (set-version): No more need to update nt/*.rc.
......
*.aux
*.cp
*.cps
*.dvi
*.fn
*.fns
*.ky
*.kys
*.log
*.op
*.ops
*.pdf
*.pg
*.pgs
*.ps
*.tmp
*.toc
*.tp
*.tps
*.vr
*.vrs
Makefile
makefile
2014-11-16 Tassilo Horn <tsdh@gnu.org>
* misc.texi (DocView Slicing): Describe how to slice with the
mouse. Fix command mentioned by slice by BoundingBox paragraph.
(Bug#18040)
2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* misc.texi (Network Security): Use "untrustworthy" instead of
......
......@@ -525,12 +525,14 @@ and the slice's width and height.
A more convenient graphical way to specify the slice is with @kbd{s
m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to
select the slice.
@c ??? How does this work?
select the slice. Simply press and hold the left mouse button at the
upper-left corner of the region you want to have in the slice, then
move the mouse pointer to the lower-right corner and release the
button.
The most convenient way is to set the optimal slice by using
BoundingBox information automatically determined from the document by
typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}).
typing @kbd{s b} (@code{doc-view-set-slice-from-bounding-box}).
@findex doc-view-reset-slice
To cancel the selected slice, type @kbd{s r}
......
*.aux
*.fn
*.fns
*.cps
*.cp
*.kys
*.ky
*.toc
*.pgs
*.pg
*.log
*.vrs
*.vr
*.dvi
*.ps
*.tp
*.tps
*.tmp
*.txt
Makefile
makefile
!cons-*.pdf
!drawers.pdf
!lambda-*.pdf
texput.log
elisp.??
elisp.???
config.log
config.cache
config.status
Makefile
makefile
elisp
elisp-?
elisp-??
elisp1*
elisp2*
*.aux
*.cp
*.cps
*.dvi
*.fn
*.fns
*.ky
*.kys
*.log
*.op
*.ops
*.pdf
*.pg
*.pgs
*.ps
*.tmp
*.toc
*.tp
*.tps
*.vr
*.vrs
Makefile
makefile
2014-11-17 Eli Zaretskii <eliz@gnu.org>
* vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
Don't assume --long is the default for "bzr log", always specify
it explicitly, in case the user defined an alias for 'log' that
uses some other format.
2014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-eldoc--get-doc-at-point): Strip
shell output before returning. (bug#18794)
2014-11-16 Dmitry Gutov <dgutov@yandex.ru>
Fix indentation before `!=' and after `+='. Originally reported
in https://github.com/mooz/js2-mode/issues/174.
* progmodes/js.el (js--indent-operator-re): Make assignments and
(in)equality operator a separate case.
(js--continued-expression-p): Escape the second `+' in the regexp.
2014-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
* window.el (handle-select-window): Deactivate shift-region (bug#19003).
2014-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
 
* net/nsm.el (nsm-new-fingerprint-ok-p): Display the certificate
......
......@@ -1685,7 +1685,7 @@ This performs fontification according to `js--class-styles'."
"Regular expression matching variable declaration keywords.")
(defconst js--indent-operator-re
(concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
(concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|"
(js--regexp-opt-symbol '("in" "instanceof")))
"Regexp matching operators that affect indentation of continued expressions.")
......@@ -1712,7 +1712,7 @@ This performs fontification according to `js--class-styles'."
(save-excursion (backward-char) (not (looking-at "[/*]/")))
(js--looking-at-operator-p)
(and (progn (backward-char)
(not (looking-at "++\\|--\\|/[/*]"))))))))))
(not (looking-at "+\\+\\|--\\|/[/*]"))))))))))
(defun js--end-of-do-while-loop-p ()
......
......@@ -3615,9 +3615,12 @@ returns will be used. If not FORCE-PROCESS is passed what
(let ((input (or force-input
(python-info-current-symbol t))))
(and input
(python-shell-send-string-no-output
(format python-eldoc-string-code input)
process))))))
;; Prevent resizing the echo area when iPython is
;; enabled. Bug#18794.
(python-util-strip-string
(python-shell-send-string-no-output
(format python-eldoc-string-code input)
process)))))))
(defun python-eldoc-function ()
"`eldoc-documentation-function' for Python.
......
......@@ -720,7 +720,7 @@ If LIMIT is non-nil, show no more than this many entries."
(with-current-buffer buffer
(apply 'vc-bzr-command "log" buffer 'async files
(append
(when shortlog '("--line"))
(if shortlog '("--line") '("--long"))
;; The extra complications here when start-revision and limit
;; are set are due to bzr log's --forward argument, which
;; could be enabled via an alias in bazaar.conf.
......@@ -755,7 +755,7 @@ If LIMIT is non-nil, show no more than this many entries."
(defun vc-bzr-expanded-log-entry (revision)
(with-temp-buffer
(apply 'vc-bzr-command "log" t nil nil
(list (format "-r%s" revision)))
(list "--long" (format "-r%s" revision)))
(goto-char (point-min))
(when (looking-at "^-+\n")
;; Indent the expanded log entry.
......
......@@ -7800,7 +7800,7 @@ is active. This function is run by `mouse-autoselect-window-timer'."
(defun handle-select-window (event)
"Handle select-window events."
(interactive "e")
(interactive "^e")
(let ((window (posn-window (event-start event))))
(unless (or (not (window-live-p window))
;; Don't switch if we're currently in the minibuffer.
......
2014-11-17 Oscar Fuentes <ofv@wanadoo.es>
* inc/ms-w32.h: Define MINGW_W64.
* nt/addpm.c: Use it.
* nt/addsection.c: Use it.
* nt/preprep.c: Use it.
2014-11-24 Glenn Morris <rgm@gnu.org>
* Makefile.in (../src/emacs.res): New target.
......
......@@ -38,9 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include <malloc.h>
/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
below 0x500. */
#ifndef _W64
/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500. */
#ifndef MINGW_W64
#define _WIN32_IE 0x400
#endif
/* Request C Object macros for COM interfaces. */
......
......@@ -26,6 +26,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <mingw_time.h>
/* MinGW-w64 gcc does not automotically define a macro for
differentiating it fom MinGW gcc. We need to test the presence of
__MINGW64_VERSION_MAJOR in _mingw.h: */
#ifdef __MINGW32__
# include <_mingw.h>
# ifdef __MINGW64_VERSION_MAJOR
# define MINGW_W64
# endif
#endif
/* #undef const */
/* Number of chars of output in the buffer of a stdio stream. */
......@@ -139,8 +149,7 @@ extern char *getenv ();
versions we still support. MinGW64 defines this to a higher value
in its system headers, and is not really compatible with values
lower than 0x0500, so leave it alone. */
#ifndef _W64
# undef _WIN32_WINNT
#ifndef MINGW_W64
# define _WIN32_WINNT 0x0400
#endif
......@@ -167,7 +176,7 @@ extern char *getenv ();
#ifdef emacs
#ifdef _W64
#ifdef MINGW_W64
/* MinGW64 specific stuff. */
/* Make sure 'struct timespec' and 'struct timezone' are defined. */
#include <sys/types.h>
......@@ -370,7 +379,7 @@ typedef int sigset_t;
typedef int ssize_t;
#endif
#ifdef _W64 /* MinGW64 */
#ifdef MINGW_W64
#ifndef _POSIX
typedef _sigset_t sigset_t;
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment