aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* upstreamJoakim Verona2012-01-235-63/+74
|\
| * Make second arg of copysign non-optional.Chong Yidong2012-01-212-1/+6
| | | | | | | | | | * src/floatfns.c (Fcopysign): Make the second argument non-optional, since nil is not allowed anyway.
| * * process.c (read_process_output): Use p instead of XPROCESS (proc).Andreas Schwab2012-01-212-6/+9
| | | | | | | | (send_process): Likewise.
| * Fix handling of persistent window parameters.Martin Rudalics2012-01-192-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (save_window_save, Fcurrent_window_configuration) (Vwindow_persistent_parameters): Do not use Qstate. Rewrite doc-strings. * window.el (window--state-get-1, window-state-get): Do not use special state value for window-persistent-parameters. Rename argument IGNORE to WRITABLE. Rewrite doc-string. (window--state-put-2): Reset all window parameters to nil before assigning values of persistent parameters. * windows.texi (Window Configurations): Rewrite references to persistent window parameters. (Window Parameters): Fix description of persistent window parameters.
| * Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.Glenn Morris2012-01-182-38/+35
| |\
| | * Fix init_buffer for USE_MMAP_FOR_BUFFERS case (backport from trunk)Yoshiaki Kasahara2012-01-182-1/+6
| | | | | | | | | | | | | | | * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing change.
| | * Fix wrong font metrics for mouse highlight (backport ↵YAMAMOTO Mitsuharu2012-01-152-1/+6
| | | | | | | | | | | | | | | | | | | | | 2011-12-15T02:12:08Z!handa@m17n.org from trunk) * src/xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992).
| | * Fix previous ChangeLog date fix (no need to merge to trunk)Glenn Morris2012-01-131-1/+1
| | |
| | * ChangeLog date fix (no need to merge to trunk)Glenn Morris2012-01-131-3/+3
| | |
| | * Take display-table into account on calculating character/string width ↵Kenichi Handa2012-01-132-37/+35
| | | | | | | | | | | | (#Bug#9496).
| | * * src/s/gnu-linux.h: Use CRT_DIR.Sven Joachim2012-01-122-2/+6
| | |
| | * Add 2012 to FSF copyright years for Emacs files (do not merge to trunk)Glenn Morris2012-01-10215-216/+216
| | |
| | * Fix uninitialized variable in note_mouse_highlight (backport from trunk).Eli Zaretskii2012-01-092-4/+4
| | | | | | | | | | | | * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947)
| | * Avoid crash on composition (backport from trunk).Johan Bockgård2012-01-092-0/+11
| | | | | | | | | | | | | | | * xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).
| | * Fix last commit.Chong Yidong2012-01-091-2/+2
| | |
| | * Fix use of uninitialized var (backport from trunk).Chong Yidong2012-01-092-5/+12
| | | | | | | | | | | | * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
| | * Fix use of uninitialized variable (backport from trunk).Eli Zaretskii2012-01-092-1/+7
| | | | | | | | | | | | | | | | | | * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a possible random value that matches one of those tested as condition to clear the mouse face.
| | * Fix glitch in scrolling_window (backport from trunk).YAMAMOTO Mitsuharu2012-01-092-8/+72
| | | | | | | | | | | | | | | | | | * dispnew.c (scrolling_window): Truncate overlaps in copy destination of scroll runs so as to avoid assigning disabled bogus rows and unnecessary graphics copy operations.
| | * Backport Bug#9990 fix from trunkEli Zaretskii2012-01-092-4/+9
| | | | | | | | | | | | | | | * src/dispnew.c (scrolling_window): Fix incorrect indices in accessing current_matrix and desired_matrix. (Bug#9990)
| | |
| \ \
*-. \ \ upstreamJoakim Verona2012-01-174-10/+127
|\ \ \ \ | | |/ /
| | * | Provide persistent window parameters.Martin Rudalics2012-01-162-7/+110
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (Vwindow_persistent_parameters): New variable. (Fset_window_configuration, save_window_save): Handle persistent window parameters. * window.el (window-state-ignored-parameters): Remove variable. (window--state-get-1): Rename argument MARKERS to IGNORE. Handle persistent window parameters. Make copy of clone-of parameter only if requested. (Bug#10348) (window--state-put-2): Install a window parameter only if it has a non-nil value or an existing parameter shall be overwritten. * windows.texi (Window Configurations, Window Parameters): Describe persistent window parameters.
| * | Fix bug #9087 with crashes on MS-Windows under throw-on-input.Eli Zaretskii2012-01-142-0/+10
| | | | | | | | | | | | | | | src/w32fns.c (signal_user_input): Don't do a QUIT, to avoid thrashing the stack of the thread.
| * | * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.Paul Eggert2012-01-122-3/+7
| | |
* | | fixes for typechecking to avoid crashes when some webkit functions are ↵Joakim Verona2012-01-121-4/+19
| | | | | | | | | | | | called with nil instead of valid webkit obj. intended to make it run on archlinux
* | | upstreamJoakim Verona2012-01-129-112/+243
|\ \ \ | |/ /
| * | Fix the last part of bug #10464 with mouse highlight at end of line.Eli Zaretskii2012-01-112-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | src/xdisp.c (rows_from_pos_range): Handle the case where the highlight ends on a newline. (mouse_face_from_buffer_pos): Fix off-by-one error in calculating he end column for display of highlight that ends on a newline before a R2L line.
| * | Duplicate-word and spelling fixes.Paul Eggert2012-01-103-5/+5
| | |
| * | init_lread fix for bug#10208.Glenn Morris2012-01-102-67/+75
| | | | | | | | | | | | | | | * src/lread.c (init_lread): If no-site-lisp, remove site-lisp dirs from load-path also when installation-directory is nil.
| * | Comments on init_lread.Glenn Morris2012-01-101-13/+63
| | |
| * | Tweak previous doc fix.Glenn Morris2012-01-101-2/+2
| | | | | | | | | | | | For some reason, invocation-directory is also a function.
| * | * src/emacs.c (syms_of_emacs) <installation-directory>: Doc fix.Glenn Morris2012-01-102-3/+7
| | | | | | | | | | | | | | | | | | This confusingly-named variable is typically nil in an installed Emacs, and in an uninstalled Emacs points to the build directory, rather than eg the target installation directory. Yay.
| * | ChangeLog fixes.Juanma Barranquero2012-01-102-7/+6
| | |
| * | * src/epaths.in (PATH_DUMPLOADSEARCH): Revert previous change.Glenn Morris2012-01-102-4/+3
| | | | | | | | | | | | | | | Makes life microscopically harder for the c. zero people configuring by hand as per INSTALL.
| * | Mainly comment fixes related to PATH_LOADSEARCH etc.Glenn Morris2012-01-092-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | * src/epaths.in (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH, PATH_EXEC) (PATH_DATA, PATH_DOC): Update the template values to be closer to their typical values these days. * Makefile.in, src/epaths.in: Comments.
| * | Fix bug #10464 with mouse highlight of display strings.Eli Zaretskii2012-01-092-8/+23
| | | | | | | | | | | | | | | | | | | | | src/xdisp.c (rows_from_pos_range): Accept additional argument DISP_STRING, and accept any glyph in a row whose object is that string as eligible for mouse highlight. Fixes mouse highlight of display strings from overlays.
* | | upstreamJoakim Verona2012-01-09215-258/+380
|\ \ \ | |/ /
| * | Merge from trunk.Paul Eggert2012-01-07215-253/+358
| |\ \
| | * | Fix bug #6540 with a crash while inserting non-ASCII text under ↵Eli Zaretskii2012-01-072-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cache-long-line-scans. src/search.c (scan_buffer): Pass character positions to know_region_cache, not byte positions. (Bug#6540)
| | * | Fix bug #10284 with renaming a directory on MS-Windows.LynX2012-01-072-5/+40
| | | | | | | | | | | | | | | | | | | | src/w32.c (sys_rename): Report EXDEV when rename of a directory fails because the target is on another logical disk. (Bug#10284)
| | * | Fix focus handling for embedded frames.David Benjamin2012-01-074-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xfns.c (Fx_focus_frame): Use it for embedded frames. * xterm.c (x_embed_request_focus): New function. * xterm.h: Add prototype. Fixes: debbugs:9977
| | * | Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-05215-215/+215
| | | |
| | * | Update short copyright year to 2012.Glenn Morris2012-01-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) <emacs_copyright>: * lib-src/etags.c (print_version) <emacs_copyright>: * lib-src/rcs2log (Copyright): Update short copyright year to 2012. * 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: * src/emacs.c (emacs_copyright): Update short copyright year to 2012.
| | * | Fix typos.Juanma Barranquero2012-01-032-7/+7
| | | |
| | * | Allow Emacs on w32 to build against and work with GnuTLS 3.x.Eli Zaretskii2012-01-012-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/gnutls.c (init_gnutls_functions): Load gnutls_check_version. Load gnutls_transport_set_lowat only if GnuTLS version is below 2.11.1. (emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for GnuTLS versions below 2.11.1. lisp/term/w32-win.el (dynamic-library-alist) <gnutls>: Load libgnutls-28.dll, from GnuTLS version 3.x, in preference to libgnutls-26.dll.
| | * | Add Bug#8828 to my 2011-06-15 entry.Paul Eggert2011-12-311-1/+1
| | | |
| | * | Doc fix for window-scroll-functions.Antoine Levitt2011-12-312-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | src/xdisp.c (syms_of_xdisp) <window-scroll-functions>: Add warning to the doc string advising against its use for altering the way windows are scrolled.
| | * | Spelling fixes.Paul Eggert2011-12-306-6/+6
| | | |
| | * | Spelling fixes.Paul Eggert2011-12-297-7/+7
| | | |
| * | | Add Bug#.Paul Eggert2011-12-291-2/+2
| | | |
| * | | emacs: fix an auto-save permissions race conditionPaul Eggert2011-12-292-6/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fileio.c (auto_saving_dir_umask): New static var. (Fmake_directory_internal): Use it. (do_auto_save_make_dir): Set it, instead of invoking chmod after creating the directory. The old code temporarily assigns too-generous permissions to the directory. (do_auto_save_eh): Clear it. (Fdo_auto_save): Catch all errrors, not just file errors, so that the var is always cleared.