Chong Yidong
fac580ebfa
Revert last change.
2010-06-25 15:32:37 -04:00
Chong Yidong
a9fdbaae1a
Change initial-frame-alist and default-frame-alist defaults (Bug#2249).
...
Since the menu-bar and tool-bar are now unconditionally turned on by
default, we can let the defcustom defaults reflect that.
* frame.el (initial-frame-alist): Give default value entries for
menu-bar-lines and tool-bar-lines consistent with the startup
default (Bug#2249).
* frame.c (Vdefault_frame_alist): Give default value entries for
menu-bar-lines and tool-bar-lines consistent with the startup
default (Bug#2249).
2010-06-25 15:24:05 -04:00
Juanma Barranquero
8c079ebbd2
src/gtkutil.c (xg_update_scrollbar_pos): Avoid C99 mid-block variable declaration.
2010-06-24 18:08:22 +02:00
Jan Djärv
bc869eca8c
Hide scroll bar when window is too small to avoid Gtk+ warning.
...
* gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed
if height is less than scroll bar min size.
(xg_show_scroll_bar): Remove, show moved to xg_update_scrollbar_pos.
* gtkutil.h (xg_show_scroll_bar): : Remove.
* xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
2010-06-22 14:28:08 +02:00
Jan Djärv
e9b7ab963b
Don't use font names from GConf if font backend can't handle it (bug#6478).
...
* xfns.c (x_default_font_parameter): Try to open font from system
before using it (bug#6478). Rename got_from_gconf to got_from_system.
2010-06-22 09:55:08 +02:00
Jan Djärv
32a679fd52
* font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437).
2010-06-22 08:42:00 +02:00
Eli Zaretskii
70c4cfbb3b
Avoid recentering when lines differ in their height.
...
xdisp.c (try_scrolling): When scroll-conservatively is set to
most-positive-fixnum, be extra accurate when scrolling window
start, to avoid missing the cursor line.
2010-06-20 21:04:30 +03:00
Eli Zaretskii
ad5a12b51b
Fix occasional recentering under scroll-conservatively.
...
xdisp.c (try_scrolling): Compute the limit for searching point
in forward scroll from scroll_max, instead of an arbitrary limit
of 10 screen lines. See
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00766.html and
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00773.html for
details.
2010-06-19 12:40:15 +03:00
Stefan Monnier
2a64315a11
Merge from emacs-23
2010-06-16 16:08:41 -04:00
Stefan Monnier
288cf4e907
* src/lread.c (read1): Phase out old-style backquotes a bit more.
2010-06-16 10:10:02 -04:00
Glenn Morris
6fda6a0c40
Backport from trunk: * src/editfns.c (Fbyte_to_string): Pacify compiler.
2010-06-14 23:16:19 -07:00
Eli Zaretskii
cbc4fd20f7
Use BidiMirroring.txt for mirroring characters in bidi context.
...
admin/unidata/bidimirror.awk: New file.
admin/unidata/BidiMirroring.txt: New file from
http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt .
admin/unidata/Makefile.in: (../../src/bidimirror.h): New target.
(all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
admin/unidata/makefile.w32-in (../../src/bidimirror.h): New target.
(all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
src/makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
bidimirror.h.
src/deps.mk (bidi.o): Depend on biditype.h and bidimirror.h.
src/bidi.c (bidi_initialize): Initialize bidi_mirror_table.
(bidi_mirror_char): Use bidi_mirror_table.
2010-06-12 18:52:43 +03:00
Eli Zaretskii
317fbf3360
Derive bidi type table from UnicodeData.txt.
...
src/bidi.c (bidi_initialize): Remove explicit initialization of
bidi_type_table; include biditype.h instead. Don't support
entries whose second codepoint is zero.
src/biditype.h: New file.
admin/unidata/biditype.awk: New file.
admin/unidata/Makefile.in (../../src/biditype.h): New target.
admin/unidata/makefile.w32-in (../../src/biditype.h): New target.
2010-06-12 17:15:25 +03:00
Eli Zaretskii
6e6e5760b3
Fix bug #6409 .
...
window.c (syms_of_window): Doc fix (bug#6409).
2010-06-12 14:30:48 +03:00
Romain Francoise
4176cba214
* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
2010-06-12 12:58:54 +02:00
Glenn Morris
64c60c2fed
* src/editfns.c (Fbyte_to_string): Pacify compiler.
2010-06-09 22:31:36 -07:00
Glenn Morris
cb4bfcb5da
* src/m/ibms390x.h: Rather than duplicating ibms390.h, just include it.
2010-06-09 22:23:00 -07:00
Juanma Barranquero
fff84c22e7
Remove duplicate ChangeLog entries.
2010-06-10 03:04:45 +02:00
Andreas Schwab
639b2760f1
Merge from emacs-23
2010-06-10 00:08:50 +02:00
Dan Nicolaescu
c1b1acc2f7
* src/s/usg5-4.h: Fix previous change.
...
Suggested by Lawrence Mitchell <wence@gmx.li>
2010-06-09 11:36:58 -07:00
Stefan Monnier
e454a4a330
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
...
Check `object's type before accessing its guts.
2010-06-09 10:31:12 -04:00
Andreas Schwab
657d4c0be3
* minibuf.c (Fall_completions): Add more checks.
2010-06-08 19:56:21 +02:00
Juanma Barranquero
9b27fd9f75
* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
2010-06-08 18:53:11 +02:00
Dan Nicolaescu
d7c5d87df6
* src/lread.c (X_OK): Remove, unused.
2010-06-07 20:12:21 -07:00
Dan Nicolaescu
0263a94123
* src/dispnew.c: Remove obsolete comment.
2010-06-07 20:06:47 -07:00
Dan Nicolaescu
a99ebb40a7
Remove INCLUDED_FCNTL.
...
* xterm.c (INCLUDED_FCNTL):
* callproc.c (INCLUDED_FCNTL):
* alloc.c (INCLUDED_FCNTL):
* systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
(emacs_get_tty, emacs_set_tty): Declare unconditionally.
2010-06-07 20:02:41 -07:00
Martin Rudalics
13b5221f4d
* window.el (pop-to-buffer): Remove the conditional that
...
compares new-window and old-window, so it will reselect
the selected window unconditionally.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html
* window.c (Fselect_window): Move `record_buffer' up to the
beginning of this function, so the buffer gets recorded
even if the selected window does not change.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html
2010-06-07 21:28:02 +03:00
Juanma Barranquero
5220357f58
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
...
(Fforward_line, Fbeginning_of_line): Reflow docstrings.
2010-06-07 12:35:57 +02:00
Dan Nicolaescu
3085237cdc
Remove BSTRING related code, all platforms define it.
...
* src/s/usg5-4.h (BSTRING): Remove definition.
* src/s/template.h (BSTRING):
* src/s/msdos.h (BSTRING):
* src/s/ms-w32.h (BSTRING):
* src/s/hpux10-20.h (BSTRING):
* src/s/gnu-linux.h (BSTRING):
* src/s/darwin.h (BSTRING):
* src/s/cygwin.h (BSTRING):
* src/s/bsd-common.h (BSTRING):
* src/s/aix4-2.h (BSTRING): Likewise.
* src/sysdep.c: Remove code depending on BSTRING not being defined.
* configure.in: Remove code dealing with BSTRING.
* lib-src/ntlib.h: Remove code dealing with BSTRING.
* nt/config.nt: Remove code depending on BSTRING.
2010-06-06 01:57:39 -07:00
Juanma Barranquero
409f291913
Remove obsolete macro BASE_LEADING_CODE_P.
...
* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.
2010-06-05 02:41:32 +02:00
Juanma Barranquero
087fc47ace
Turn `directory-sep-char' into a noop.
...
* lisp/subr.el (directory-sep-char): Move from fileio.c and make a defconst.
* src/emacs.c (decode_env_path): Don't check DIRECTORY_SEP,
call dostounix_filename directly.
* src/fileio.c (CORRECT_DIR_SEPS): Remove.
(Ffile_name_directory, directory_file_name, Fexpand_file_name)
(Fsubstitute_in_file_name): Use dostounix_filename instead.
(file_name_as_directory): Use dostounix_filename, DIRECTORY_SEP.
(syms_of_fileio) <directory-sep-char>: Move to subr.el.
* src/lisp.h [WINDOWSNT] (Vdirectory_sep_char): Don't declare.
(DIRECTORY_SEP): Define unconditionally.
* src/w32proc.c (CORRECT_DIR_SEPS): Remove.
(Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename.
* src/s/ms-w32.h (DIRECTORY_SEP): Remove.
2010-06-04 16:13:35 +02:00
Andreas Schwab
f07b083d4a
Add bug number
2010-06-04 00:52:38 +02:00
Andreas Schwab
0eb7675e67
* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
...
address.
2010-06-04 00:47:35 +02:00
Dan Nicolaescu
eb697db597
Move UNEXEC definition to autoconf.
...
* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.
* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.
* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
2010-06-03 15:16:02 -07:00
Juanma Barranquero
aa3830c497
Remove obsolete pre-unicode2 macros.
...
* character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove.
* composite.c (composition_reseat_it):
* data.c (Faset):
* fns.c (Ffillarray):
* regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD.
[!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.
2010-06-03 21:02:32 +02:00
Juri Linkov
d234d13e4b
* src/buffer.c (Fother_buffer): Add CHECK_FRAME.
...
(Fswitch_to_buffer): Remove unused variable `err'.
2010-06-03 21:50:00 +03:00
Juanma Barranquero
78edd3b72d
Fix typos.
2010-06-03 17:34:35 +02:00
Glenn Morris
e23dc1e2f0
Remove NO_SOCK_SIGIO references.
...
* src/m/template.h (NO_SOCK_SIGIO): Remove, no longer used.
* nextstep/DEV-NOTES: Remove out-of-date information.
2010-06-02 22:50:48 -07:00
Glenn Morris
05b09564d2
m/hp800.h simplification.
...
* src/m/hp800.h (alloca) [__NetBSD__ && __GNUC__]: No need to define it,
now that AH_BOTTOM does it.
2010-06-02 22:41:49 -07:00
Glenn Morris
824e29787c
HAVE_ALLOCA not needed since alloca.s was removed.
...
* src/m/hp800.h (HAVE_ALLOCA):
* src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed.
* msdos/sed2v2.inp: Do not edit HAVE_ALLOCA.
* admin/CPP-DEFINES: Remove HAVE_ALLOCA.
2010-06-02 22:35:54 -07:00
Glenn Morris
0d4bcf4ddd
NOT_C_CODE is always true now.
...
* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.
* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
Remove NOT_C_CODE tests, it is always true now.
* nt/config.nt: Remove NOT_C_CODE tests, it is always true now.
* admin/CPP-DEFINES: Remove NOT_C_CODE.
2010-06-02 22:29:02 -07:00
Dan Nicolaescu
08a494a3b0
Fix config.h includes.
...
* src/xsettings.c:
* src/xgselect.c:
* src/nsterm.m:
* src/nsselect.m:
* src/nsimage.m:
* src/nsfont.m:
* src/nsfns.m:
* src/dbusbind.c: Use #include <config.h> instead of "config.h" as all
other files do.
2010-06-01 21:29:53 -07:00
Dan Nicolaescu
75934b1d0f
* src/gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused.
2010-06-01 19:47:43 -07:00
Dan Nicolaescu
9f32a766dc
* src/s/sol2-6.h: Remove obsolete comments.
2010-06-01 19:43:47 -07:00
Dan Nicolaescu
c55d2abfc7
Remove unnecessary alloca.h includes.
...
* src/keymap.c: Do not include alloca.h, config.h does that.
* src/sysdep.c: Likewise. Do not define fwrite, not used.
2010-06-01 19:40:59 -07:00
Stefan Monnier
fd67a7000e
Merge from emacs-23
2010-05-31 22:34:49 -04:00
Stefan Monnier
06ac62b4db
* sysdep.c (child_setup_tty): Move the non-canonical initialization to
...
the HAVE_TERMIO where it belongs.
Fixes: debbugs:6149
2010-05-31 21:49:15 -04:00
Stefan Monnier
1ab8293c36
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
...
of bug#6305).
2010-05-31 15:35:04 -04:00
Juanma Barranquero
b925d23104
src/ChangeLog: Add missing bug id.
2010-05-31 17:30:13 +02:00
Juanma Barranquero
a73f9c9dfd
src/ChangeLog: Fix typos.
2010-05-31 01:09:32 +02:00