Commit graph

107658 commits

Author SHA1 Message Date
Glenn Morris
92f7c6f1a3 Add missing nextstep file from previous change. 2012-09-16 11:51:39 -07:00
Glenn Morris
83da1b5565 Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.

* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.

* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.

* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.

* .bzrignore: Add some nextstep files.

* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.

* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.

* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 11:49:00 -07:00
Chong Yidong
40d70ecb6d Fix marker usage in align-areas.
* align.el (align-areas): Call the indication function with
positions instead of markers for arguments.

Fixes: debbugs:12343
2012-09-17 00:27:20 +08:00
Kenichi Handa
0b97c030c6 merge trunk 2012-09-17 01:18:23 +09:00
Kenichi Handa
85a43e2ea4 font.c (Ffont_shape_gstring): Fix previous change; GLYPHs may not covert the last few charactes. 2012-09-17 01:17:31 +09:00
Chong Yidong
1667e065d0 * files.el (parse-colon-path): Use split-string.
Fixes: debbugs:12351
2012-09-16 23:57:28 +08:00
Kenichi Handa
ba13e6168a merge trunk 2012-09-16 20:47:45 +09:00
Martin Rudalics
a8c729af93 Window parameter functions again accept any window as argument (Bug#12452).
* window.c (Fwindow_parameter, Fset_window_parameter): Accept
any window as argument (Bug#12452).
2012-09-16 12:25:24 +02:00
Jan Djärv
c077c0598d Try to fix crashes introduced by 2012-09-10T21:01:45Z!jan.h.d@swipnet.se.
* nsfns.m (Fx_open_connection): Move initialization of ns_*_types
to ns_term_init to avoid memory leak.

* nsterm.m (ns_update_begin): Initialize bp after lcokFocus, use
explicit retain/release.
(ns_term_init): Only allow one display.  Initialize outerpool and
ns_*_types.
2012-09-16 11:11:50 +02:00
Chong Yidong
71ce58e752 Mark display-buffer-function as obsolete.
* lisp/window.el (display-buffer-function): Mark as obsolete.

Fixes: debbugs:12166
2012-09-16 12:52:38 +08:00
Chong Yidong
fdc2806d0b * window.el (special-display-popup-frame): Doc fix.
Fixes: debbugs:8853
2012-09-16 12:43:46 +08:00
Chong Yidong
f1be615c41 Alter last change to be compatible with Emacs 23.
* lisp/progmodes/compile.el (compilation-parse-errors): Accept list
values similar to font-lock-keywords.  Suggested by
Oleksandr Manzyuk.
(compilation-error-regexp-alist): Doc fix.

Fixes: debbugs:12136
2012-09-16 12:31:02 +08:00
Chong Yidong
c584eaf9c7 In compilation-error-regexp-alist, allow more HIGHLIGHT types.
* progmodes/compile.el (compilation-parse-errors): Apply any value
that is a valid font-lock-face property.
(compilation-error-regexp-alist): Doc fix.

Fixes: debbugs:12136
2012-09-16 12:16:51 +08:00
Glenn Morris
72aa16e19b Add option to ask bzr itself for the emacs bzr revision
* lisp/version.el (emacs-bzr-version-bzr): New function.
(emacs-bzr-get-version): Add optional EXTERNAL argument.
2012-09-15 13:00:45 -07:00
Glenn Morris
830be228cd Auto-commit of loaddefs files. 2012-09-15 06:20:56 -04:00
Glenn Morris
e2d8f316d1 Auto-commit of generated files. 2012-09-15 06:17:37 -04:00
Paul Eggert
39a57ad07b Port _setjmp fix to POSIXish hosts as well as Microsoft.
* nt/config.nt: Attempt to sync with autogen/config.in.
(HAVE_SIGSETJMP, HAVE__SETJMP): New macros.
(_longjmp, _setjmp): Remove.
* src/image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as
it's needed on POSIXish hosts that lack _setjmp.  Attempt to solve
the Microsoft problem in a different way, by altering nt/config.nt.
2012-09-15 01:45:27 -07:00
Eli Zaretskii
7105c8cbf3 Fix MS-Windows build broken by 2012-09-15T07:06:56Z!eggert@cs.ucla.edu, completing fix for bug #12446.
src/w32xfns.c:
 src/w32uniscribe.c:
 src/w32term.c:
 src/w32select.c:
 src/w32reg.c:
 src/w32proc.c:
 src/w32menu.c:
 src/w32inevt.c:
 src/w32heap.c:
 src/w32font.c:
 src/w32fns.c:
 src/w32console.c:
 src/w32.c:
 src/w16select.c: Remove inclusion of setjmp.h, as it is now included
 by lisp.h.  This completes removal of setjmp.h inclusion
 erroneously announced in the previous commit.
 src/lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
 more accurate.
 src/image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
 not defined as a macro.  The latter happens on MS-Windows.
2012-09-15 11:03:11 +03:00
Paul Eggert
0328b6de4a Port better to POSIX hosts lacking _setjmp.
* configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols.
(_setjmp, _longjmp): Remove.
* src/lisp.h: Include <setjmp.h> here, since we use its symbols here.
All instances of '#include <setjmp.h>' removed, if the
only reason for the instance was because "lisp.h" was included.
(sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
and _longjmp with the new symbols.  Emacs already uses _setjmp if
available, so this change affects only POSIXish hosts that have
sigsetjmp but not _setjmp, such as some versions of Solaris and
Unixware.  (Also, POSIX-2008 marks _setjmp as obsolescent.)
* src/image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
(png_load_body) [HAVE_PNG]:
(PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
(PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
since PNG requires jmp_buf.  This is the only exception to the
general rule that we now use sys_setjmp and sys_longjmp.
This exception is OK since this code does not change the signal
mask or longjmp out of a signal handler.

Fixes: debbugs:12446
2012-09-15 00:06:56 -07:00
Kenichi Handa
dcbd9236f7 merge trunk 2012-09-15 15:14:18 +09:00
Kenichi Handa
ea964864a6 font.c (Ffont_shape_gstring): Don't adjust grapheme cluster here, but just check the validity of glyphs in the glyph-string. 2012-09-15 11:24:26 +09:00
Glenn Morris
823751606a Improve vc-bzr-working-revision for lightweight checkouts
* lisp/vc/vc-bzr.el (vc-bzr-working-revision): For lightweight local
checkouts, check the parent dirstate matches the branch.
Add "--tree" to "bzr revno" arguments.  Don't try to shorten the
empty string.
2012-09-14 21:11:52 -04:00
Glenn Morris
fea895b1d2 Tweak previous emacs-bzr-get-version change 2012-09-14 20:45:00 -04:00
Glenn Morris
f40a97091f Improve emacs-bzr-version for lightweight checkouts (bug#12441)
* lisp/version.el (emacs-bzr-version): Doc fix.
(emacs-bzr-version-dirstate): New function.
(emacs-bzr-get-version): For lightweight checkouts, if the parent
is local try and check that it matches the branch.  If not, just
use dirstate information.
2012-09-14 20:33:40 -04:00
Juri Linkov
cb26b7f572 * lisp/dired-aux.el (dired-do-chmod): Use `eq' to detect empty input.
Fixes: debbugs:12399
2012-09-15 01:58:43 +03:00
Paul Eggert
2af0342954 Fix glitches with 'configure --without-sync-input'.
* configure.ac (--without-sync-input): Fix typo in usage message.
* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
Include "syssignal.h", for 'main_thread'.
2012-09-14 15:01:19 -07:00
Paul Eggert
e3141fcf84 * configure.ac: Port to hosts lacking gtk.
(PKG_CHECK_MODULES): Capture pkg-config diagnostics
better, in particular, problems in invoking pkg-config itself.
This is useful on hosts that don't have pkg-config.
(GTK_MODULES): Do not exit 'configure' simply because gtk3
and gtk2 are both missing.  Problem found on Solaris 8.
2012-09-14 11:56:19 -07:00
Dmitry Antipov
2f294edf3a Avoid out-of-range marker position (Bug#12426).
* insdel.c (replace_range, replace_range_2): Adjust
markers before overlays, as suggested by comments.
(insert_1_both, insert_from_buffer_1, adjust_after_replace):
Remove redundant check before calling offset_intervals.
2012-09-14 18:23:50 +04:00
Stefan Monnier
0fb3cb7c89 * lisp/emacs-lisp/advice.el (ad-prognify): Remove, use macroexp-progn. 2012-09-14 09:44:31 -04:00
Glenn Morris
33bd7ff0f6 Auto-commit of generated files. 2012-09-14 06:17:31 -04:00
Martin Rudalics
6b533e9cb5 In Fformat_mode_line always save/restore current buffer. (Bug#12387)
* xdisp.c (Fformat_mode_line): Unconditionally save/restore current
buffer.  (Bug#12387)
2012-09-14 08:55:38 +02:00
Stefan Monnier
2de39f089a * lisp/emacs-lisp/edebug.el: Miscellaneous cleanup.
Remove obsolete byte-compiler hack that tried to silence some warnings.
(edebug-submit-bug-report): Remove.
(edebug-get-buffer-window, edebug-sit-for, edebug-input-pending-p):
Remove aliases, use the un-prefixed name instead.
(edebug-pop-to-buffer): Consider other frames.
(edebug-original-read):: Make it more obvious that it's always defined.
(edebug--make-form-data-entry, edebug--form-data-name)
(edebug--form-data-begin, edebug--form-data-end): Rename from the
single-dashed name, and implement with cl-defstruct.
(edebug-set-form-data-entry): Use the standard accessors.
(edebug-make-top-form-data-entry): Use push.
(edebug-no-match): Drop useless `funcall'.
(mapcar, mapconcat, mapatoms, apply, funcall): Don't add debug specs
to functions.
(defsubst, dont-compile, eval-when-compile, eval-and-compile)
(delay-mode-hooks, with-temp-file, with-temp-message, ad-dolist)
(with-syntax-table, push, pop, 1value, noreturn, defadvice)
(easy-menu-define, with-custom-print): Remove redundant specs.
(edebug-outside-overriding-local-map)
(edebug-outside-overriding-terminal-local-map): Remove, unused.
(edebug--display): Bind unread-command-events directly to nil rather
than binding it to unread-command-events and later setting it to nil.
(edebug--display): Kill edebug-eval-buffer here...
(edebug--recursive-edit): ...rather than here.
Bind standard-output and standard-input.
(edebug-eval): Check cl-macroexpand-all is fboundp.
(edebug-temp-display-freq-count): Fix last change.

* lisp/emacs-lisp/easymenu.el (easy-menu-define): Add `debug' spec.
* lisp/subr.el (noreturn, 1value): Add `debug' spec.
* lisp/emacs-lisp/advice.el: Require cl-lib.
(ad-copy-tree): Remove, use copy-tree instead.
(ad-dolist): Remove use dolist or cl-dolist instead.
(ad-do-return): Remove, use cl-return instead.
(defadvice): Add `debug' spec.
2012-09-13 23:55:16 -04:00
Juanma Barranquero
2a7931e354 src/makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies. 2012-09-14 03:22:21 +02:00
Juanma Barranquero
fe5979317f nt/config.nt: Sync with autogen/config.in.
(BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, HAVE_CBRT, HAVE_LOGB, NO_TERMIO): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New macros.
2012-09-14 03:09:22 +02:00
Juri Linkov
5b68b33315 * lisp/dired-aux.el (dired-do-chxxx): Use `eq' to detect empty input.
Fixes: debbugs:12399
2012-09-14 02:42:39 +03:00
Glenn Morris
6a2e686836 Update some function declarations
* lisp/calc/calc-ext.el (math-compose-expr):
* lisp/calc/calc.el (math-compose-expr):
* lisp/progmodes/cc-defs.el (cl-macroexpand-all):
* lisp/progmodes/cc-langs.el (delete-duplicates, mapcan)
(cl-macroexpand-all): Update declarations.
2012-09-13 14:41:21 -04:00
Glenn Morris
b9800ec43b * lisp/vc/vc.el: No need to require ediff.
(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.
2012-09-13 14:23:33 -04:00
Paul Eggert
c18e885bdd Use a more backwards-compatible timer format.
* etc/NEWS: Document it.
* lisp/emacs-lisp/timer.el (timer): PSECS is now at the end, rather than
being right after USECS, as that better supports old code that
inadvisedly looked directly at the timer vector.
* src/keyboard.c (decode_timer): Get PSECS from the 8th (origin-0)
vector element, not from the 4th, since PSECS is now at the end.
(Fcurrent_idle_time): Doc fix.

Fixes: debbugs:12430
2012-09-13 09:23:06 -07:00
Kenichi Handa
d607d30302 language/chinese.el ("Chinese-GB", "Chinese-BIG5", "Chinese-CNS", "Chinese-EUC-TW"): Add chinese-gbk to coding-priority property of these language environment. 2012-09-14 00:21:58 +09:00
Jan Djärv
4d0b77fc57 * configure.ac: Report Gtk+ 3 as GTK. 2012-09-13 14:02:00 +02:00
Juanma Barranquero
fc0c31f839 Fix typos in ChangeLogs. 2012-09-13 13:42:18 +02:00
Katsumi Yamaoka
5e2b4ce123 gnus-art.el (gnus-article-stop-animations): Use gnus-timer--function that is an alias to timer--function 2012-09-13 11:14:30 +00:00
Glenn Morris
4fa924951b Auto-commit of generated files. 2012-09-13 06:17:31 -04:00
Paul Eggert
5087f097cd * texinfo.tex: Merge from gnulib. 2012-09-13 00:28:15 -07:00
Jan Djärv
2c484e7585 * configure.ac: Reorder Xaw3d messages. 2012-09-13 08:27:21 +02:00
Jan Djärv
1352271a4d * etc/NEWS (--with-x-toolkit): Mention Gtk+ 3 is now default. 2012-09-13 08:13:26 +02:00
Paul Eggert
72eac303ea Fix glitches caused by addition of psec to timers.
* etc/NEWS: Document timer format change.
* lisp/image.el (image-animate-timer):
* lisp/time.el (display-time-world-timer):
Use timer--function and timer--args rather than raw access to
timer vector.
* lisp/gnus/gnus-art.el (gnus-article-stop-animations):
Use timer--function rather than raw access to timer vector.

Fixes: debbugs:12430
2012-09-12 23:09:45 -07:00
Dmitry Antipov
d59a1afb9a Function to mark objects and remove killed buffers at once.
* alloc.c (discard_killed_buffers): Rename to ...
(mark_discard_killed buffers) ... new name.  Add marking
of remaining objects.  Fix comment.  Adjust users.
(mark_object): Do not touch frame buffer lists here.
* frame.c (delete_frame): Reset frame buffer lists here.
2012-09-13 09:18:26 +04:00
Paul Eggert
8ea47e3a50 Better workaround for GNOME bug when --enable-gcc-warnings.
* emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
2012-09-12 21:14:33 -07:00
Glenn Morris
2168fe4f2a byte-compile-warning-prefix tweak
* lisp/emacs-lisp/bytecomp.el (byte-compile-warning-prefix): If not
compiling a file, try using load-file-name.
2012-09-12 22:41:46 -04:00