mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
Merge from mainline.
This commit is contained in:
Paul Eggert
commit
2763cfc268
@ -1,3 +1,8 @@
|
||||
2011-02-20 Christoph Scholtes <cschol2112@gmail.com>
|
||||
|
||||
* lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
|
||||
src/makefile.w32-in.
|
||||
|
||||
2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Import filemode module from gnulib.
|
||||
|
||||
@ -27,7 +27,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
|
||||
$(BLD)/getopt.$(O) \
|
||||
$(BLD)/getopt1.$(O) \
|
||||
$(BLD)/strftime.$(O) \
|
||||
$(BLD)/time_r.$(O)
|
||||
$(BLD)/time_r.$(O) \
|
||||
$(BLD)/md5.$(O)
|
||||
|
||||
#
|
||||
# Build the library
|
||||
@ -93,11 +94,19 @@ $(BLD)/time_r.$(O) : \
|
||||
$(EMACS_ROOT)/src/m/intel386.h \
|
||||
$(EMACS_ROOT)/src/config.h
|
||||
|
||||
$(BLD)/md5.$(O) : \
|
||||
$(EMACS_ROOT)/lib/md5.c \
|
||||
$(EMACS_ROOT)/src/s/ms-w32.h \
|
||||
$(EMACS_ROOT)/src/m/intel386.h \
|
||||
$(EMACS_ROOT)/src/config.h \
|
||||
$(EMACS_ROOT)/nt/inc/sys/stat.h \
|
||||
$(EMACS_ROOT)/lib/md5.h
|
||||
|
||||
# The following dependencies are for supporting parallel builds, where
|
||||
# we must make sure $(BLD) exists before any compilation starts.
|
||||
#
|
||||
$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
|
||||
$(BLD)/strftime.$(O) $(BLD)/time_r.$(O): stamp_BLD
|
||||
$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
|
||||
|
||||
#
|
||||
# Headers we would preprocess if we could.
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2011-02-20 Alan Mackenzie <acm@muc.de>
|
||||
|
||||
* progmodes/cc-cmds.el (c-beginning-of-statement): Avoid loop in
|
||||
locating the beginning of a macro. (Bug#7595)
|
||||
|
||||
2011-02-20 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* edmacro.el (edmacro-eight-bits): Make it a defcustom.
|
||||
@ -836,7 +841,7 @@
|
||||
* progmodes/cc-cmds.el (c-forward-over-illiterals):
|
||||
Continue parsing if we encounter a naked # (Bug#7595).
|
||||
(c-beginning-of-statement): Avoid loop in locating the beginning
|
||||
of a macro.
|
||||
of a macro. (Not actually committed until 2011-02-20, see above).
|
||||
|
||||
2011-01-31 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
|
||||
@ -3613,7 +3613,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
|
||||
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
|
||||
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
|
||||
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
|
||||
;;;;;; dired-diff) "dired-aux" "dired-aux.el" "281daa2642afe5c52ba09a29ea17dbd7")
|
||||
;;;;;; dired-diff) "dired-aux" "dired-aux.el" "9d6333fab9c0f1b49e0bf2a536b8f245")
|
||||
;;; Generated autoloads from dired-aux.el
|
||||
|
||||
(autoload 'dired-diff "dired-aux" "\
|
||||
@ -4072,7 +4072,7 @@ true then the type of the file linked to by FILE is printed instead.
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
|
||||
;;;;;; "9e412288898d065e4ae92d106e0426c0")
|
||||
;;;;;; "86d436093caa9ae80f7b73915c6a4b4c")
|
||||
;;; Generated autoloads from dired-x.el
|
||||
|
||||
(autoload 'dired-jump "dired-x" "\
|
||||
|
||||
@ -4306,7 +4306,7 @@ With prefix argument N moves forward N messages with these labels.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69")
|
||||
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "04902da045706fb7f2b0915529ed161b")
|
||||
;;; Generated autoloads from rmailmm.el
|
||||
|
||||
(autoload 'rmail-mime "rmailmm" "\
|
||||
|
||||
@ -2654,14 +2654,19 @@ sentence motion in or near comments and multiline strings."
|
||||
;; Are we about to move forward into or out of a
|
||||
;; preprocessor command?
|
||||
(when (eq (cdr res) 'macro-boundary)
|
||||
(save-excursion
|
||||
(end-of-line)
|
||||
(setq macro-fence
|
||||
(and (not (eobp))
|
||||
(progn (c-skip-ws-forward)
|
||||
(c-beginning-of-macro))
|
||||
(progn (c-end-of-macro)
|
||||
(point))))))
|
||||
(setq macro-fence
|
||||
(save-excursion
|
||||
(if macro-fence
|
||||
(progn
|
||||
(end-of-line)
|
||||
(and (not (eobp))
|
||||
(progn (c-skip-ws-forward)
|
||||
(c-beginning-of-macro))
|
||||
(progn (c-end-of-macro)
|
||||
(point))))
|
||||
(and (not (eobp))
|
||||
(c-beginning-of-macro)
|
||||
(progn (c-end-of-macro) (point)))))))
|
||||
;; Are we about to move forward into a literal?
|
||||
(when (memq (cdr res) '(macro-boundary literal))
|
||||
(setq range (c-ascertain-following-literal)))
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
2011-02-20 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* makefile.w32-in ($(BLD)/fns.$(O)): Depend on
|
||||
$(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
|
||||
|
||||
2011-02-20 Christoph Scholtes <cschol2112@gmail.com>
|
||||
|
||||
* makefile.w32-in: Remove md5.$(O).
|
||||
($(BLD)/md5.$(O)): Remove prerequisites, moved to
|
||||
lib/makefile.w32-in.
|
||||
|
||||
2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Import filemode module from gnulib.
|
||||
|
||||
@ -81,7 +81,6 @@ OBJ1 = $(BLD)/alloc.$(O) \
|
||||
$(BLD)/lread.$(O) \
|
||||
$(BLD)/macros.$(O) \
|
||||
$(BLD)/marker.$(O) \
|
||||
$(BLD)/md5.$(O) \
|
||||
$(BLD)/minibuf.$(O) \
|
||||
$(BLD)/w32.$(O) \
|
||||
$(BLD)/w32heap.$(O) \
|
||||
@ -221,7 +220,7 @@ GLOBAL_SOURCES = dosfns.c msdos.c \
|
||||
syntax.c bytecode.c \
|
||||
process.c callproc.c unexw32.c \
|
||||
region-cache.c sound.c atimer.c \
|
||||
doprnt.c intervals.c textprop.c composite.c md5.c
|
||||
doprnt.c intervals.c textprop.c composite.c
|
||||
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
|
||||
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
|
||||
obj = $(GLOBAL_SOURCES:.c=.o)
|
||||
@ -843,6 +842,7 @@ $(BLD)/fns.$(O) : \
|
||||
$(EMACS_ROOT)/nt/inc/nl_types.h \
|
||||
$(EMACS_ROOT)/nt/inc/unistd.h \
|
||||
$(EMACS_ROOT)/nt/inc/sys/time.h \
|
||||
$(EMACS_ROOT)/lib/md5.h \
|
||||
$(LISP_H) \
|
||||
$(SRC)/atimer.h \
|
||||
$(SRC)/blockinput.h \
|
||||
@ -856,7 +856,6 @@ $(BLD)/fns.$(O) : \
|
||||
$(SRC)/intervals.h \
|
||||
$(SRC)/keyboard.h \
|
||||
$(SRC)/keymap.h \
|
||||
$(SRC)/md5.h \
|
||||
$(SRC)/systime.h \
|
||||
$(SRC)/w32gui.h \
|
||||
$(SRC)/window.h
|
||||
@ -1135,11 +1134,6 @@ $(BLD)/marker.$(O) : \
|
||||
$(SRC)/buffer.h \
|
||||
$(SRC)/character.h
|
||||
|
||||
$(BLD)/md5.$(O) : \
|
||||
$(SRC)/md5.c \
|
||||
$(CONFIG_H) \
|
||||
$(SRC)/md5.h
|
||||
|
||||
$(BLD)/menu.$(O) : \
|
||||
$(SRC)/menu.c \
|
||||
$(CONFIG_H) \
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2011-02-20 Ulf Jasper <ulf.jasper@web.de>
|
||||
|
||||
* automated/icalendar-tests.el: Move from icalendar-testsuite.el;
|
||||
convert to ERT format.
|
||||
|
||||
2011-02-14 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* automated/bytecomp-tests.el: Move from bytecomp-testsuite.el;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user