aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * cl-lib.el (buffer-string): Simplify last change.Stefan Monnier2012-08-281-2/+1
| | | | Fixes: debbugs:12293
* * lisp/emacs-lisp/cl-lib.el (buffer-string): Fix setter macro.Stefan Monnier2012-08-282-17/+22
| | | | Fixes: debbugs:12293
* * admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.Glenn Morris2012-08-282-3/+14
|
* * admin/charsets/mule-charsets.el (header): Fix typo.Andreas Schwab2012-08-2810-8/+22
| | | | | | | | | | * etc/charsets/MULE-ethiopic.map: Fix typo in comment. * etc/charsets/MULE-ipa.map: Likewise. * etc/charsets/MULE-is13194.map: Likewise. * etc/charsets/MULE-lviscii.map: Likewise. * etc/charsets/MULE-sisheng.map: Likewise. * etc/charsets/MULE-tibetan.map: Likewise. * etc/charsets/MULE-uviscii.map: Likewise.
* Improve NS dialogs. Add close button, remove ugly casts.Jan Djärv2012-08-283-39/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | * nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize button_values to NULL. Call setStykeMask so dialogs get a close button. (windowShouldClose:): Set window_closed. (dealloc): New member, free button_values. (process_dialog:): Make member function. Remove window argument, replace window with self. Count buttons and allocate and store values in button_values. (addButton:value:row:): value is int with the name tag. Call setTag with tag. Remove return self, declare return value as void. (addString:row:): Remove return self, declare return value as void. (addSplit): Remove return self, declare return value as void. (clicked:): Remove return self, declare return value as void. Set dialog_return to button_values[seltag]. Code formatting change. (initFromContents:isQuestion:): Adjust call to process_dialog. Code formatting change. (timeout_handler:): Set timer_fired to YES. (runDialogAt:): Set timer_fired to NO. Handle click on close button as quit. * nsterm.h (EmacsDialogPanel): Make timer_fired BOOL. Add window_closed and button_values. Add void as return value for add(Button|String|Split). addButton takes int instead of Lisp_Object. Add process_dialog as new member.
* Merge from emacs-24; up to 2012-05-04T19:17:[email protected]Glenn Morris2012-08-2812-76/+243
|\
| * Fix broken completion in sh-modeLeo Liu2012-08-272-18/+12
| | | | | | | | See: http://debbugs.gnu.org/12220
| * * skeleton.el (skeleton-untabify): Change to nil.Leo Liu2012-08-272-1/+3
| | | | | | | | Fixes: debbugs:12223
| * Change sh-indent-comment to tLeo Liu2012-08-272-1/+6
| | | | | | | | See: http://debbugs.gnu.org/12267
| * Update release logsChong Yidong2012-08-2422-30/+30
| |
| * Fix bug #12242 with crashes in ralloc.c on OpenBSD.Eli Zaretskii2012-08-242-13/+37
| | | | | | | | | | src/ralloc.c (free_bloc): Don't dereference a 'heap' structure if it is not one of the heaps we manage.
| * * lisp/files.el (safe-local-eval-forms): Fix before-save-hook entry to beStefan Monnier2012-08-232-1/+7
| | | | | | | | | | | | buffer-local; add delete-trailing-whitespace. Fixes: debbugs:12259
| * * lisp/progmodes/hideif.el (hif-compress-define-list): Fix typo. (tiny change)Jeremy Moore2012-08-222-1/+6
| | | | | | | | Fixes: debbugs:11951
| * * lisp/progmodes/hideshow.el (hs-block-end-regexp): Restore lostDan Nicolaescu2012-08-202-0/+7
| | | | | | | | buffer local setting.
| * Fix comment in log-edit.el.Chong Yidong2012-08-201-4/+4
| |
| * Auto-commit of generated files.Glenn Morris2012-08-161-10/+10
| |
| * Add 24.2 NEWS section (do not merge to trunk)Glenn Morris2012-08-151-0/+5
| |
| * * lisp/vc/log-edit.el (log-edit-font-lock-gnu-style): Mark safe if boolean.Glenn Morris2012-08-152-0/+10
| | | | | | | | Do not merge to trunk.
| * Regenerate ldefs-boot.elChong Yidong2012-08-161-22/+22
| |
| * Bump version to 24.2Chong Yidong2012-08-1636-22/+114
| |
| * Fix for the buffer-local rcirc-encode-coding-system caseLeo Liu2012-08-152-16/+22
| | | | | | | | in rcirc-split-message.
| * Add CVE number to ChangeLogGlenn Morris2012-08-141-0/+1
| |
| * * src/eval.c (Fcalled_interactively_p): Doc fix. (Bug#11747)Glenn Morris2012-08-142-5/+8
| |
| * Auto-commit of generated files.Glenn Morris2012-08-142-5/+0
| |
| * Fix build failure with glibc-2.16.Chong Yidong2012-08-144-23/+15
| | | | | | | | | | | | | | | | * lib/gnulib.mk: * lib/stdio.in.h: * m4/stdio_h.m4: Do not assume that gets is defined. Fixes: debbugs:11873
| * * systime.h (EMACS_TIME_CMP): Don't cast time_t values to long.Ulrich Mueller2012-08-142-7/+9
| | | | | | | | Fixes: debbugs:11712
| * Improve the file-local variable regression test.Chong Yidong2012-08-142-21/+123
| | | | | | | | | | * test/automated/files.el: Test every combination of values for enable-local-variables and enable-local-eval.
| * Backport: Don't disable Unicode menus on Windows NT and later.Eli Zaretskii2012-08-133-2/+15
| | | | | | | | | | | | | | | | src/w32menu.c: Include w32heap.h. (add_menu_item): If the call to AppendMenuW (via unicode_append_menu) fails, disable Unicode menus only if we are running on Windows 9X/Me. src/makefile.w32-in ($(BLD)/w32menu.$(O)): Depend on w32heap.h.
| * * lisp/net/rcirc.el (rcirc-split-message): New function.Leo Liu2012-08-142-15/+29
| | | | | | | | | | | | (rcirc-send-message): Use it. Fixes: debbugs:12051
| * Backport fix for Bug#11677 from trunkChong Yidong2012-08-132-17/+29
| |
| * Backports for 1995-05-29T20:16:[email protected], ↵Jan Djärv2012-08-123-34/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1995-05-03T21:38:[email protected] and 1995-05-31T19:46:[email protected]. * nsmenu.m (ns_update_menubar): Add braces to ambigous if-else. * nsmenu.m (Popdown_data): New struct. (pop_down_menu): p->pointer is Popdown_data. Release the pool and free Popdown_data. (ns_popup_dialog): Use NSAutoreleasePool and pass it to pop_down_menu. (initWithContentRect): Make imgView and contentView non-static and autorelease them. Also autorelease img and matrix. (dealloc): Remove (Bug#1995-05-29T20:16:[email protected]). * nsterm.m (keyDown:): Interpret flags without left/right bits as the left key (Bug#1995-05-03T21:38:[email protected]). * nsterm.m (ns_read_socket): Return early if there is a modal window (Bug#1995-05-31T19:46:[email protected]).
* | In Fset_window_configuration install revison of reverted fix.Martin Rudalics2012-08-282-1/+17
| | | | | | | | | | * window.c (Fset_window_configuration): Install revision of reverted fix.
* | Remove handling of auto-buffer-name window parameter.Martin Rudalics2012-08-282-15/+6
| | | | | | | | | | * window.c (Fset_window_configuration): Remove handling of auto-buffer-name window parameter.
* | Do not allow to set major mode for a dead buffer.Dmitry Antipov2012-08-282-4/+12
| | | | | | | | | | | | | | * buffer.c (Fset_buffer_major_mode): Signal an error if the buffer is dead. (Fother_buffer, other_buffer_safely): Remove redundant nested declaration.
* | gnus-sum.el (gnus-summary-enter-digest-group): Work for encoding and charsetKatsumi Yamaoka2012-08-282-4/+26
| |
* | * lisp/info.el (Info-fontify-node): Hide empty lines at the end of the node.Juri Linkov2012-08-282-0/+11
| | | | | | | | Fixes: debbugs:12272
* | Always use set_buffer_if_live to restore original buffer at unwind.Dmitry Antipov2012-08-2817-24/+37
| | | | | | | | | | | | | | | | * buffer.h (record_unwind_current_buffer): New function. * bytecode.c, dispnew.c, editfns.c, fileio.c, fns.c, insdel.c: * keyboard.c, keymap.c, minibuf.c, print.c, process.c, textprop.c: * undo.c, window.c: Adjust users. * buffer.c (set_buffer_if_live): Fix comment.
* | Fix usage of set_buffer_internal.Dmitry Antipov2012-08-2810-38/+40
| | | | | | | | | | | | | | | | | | | | | | | | * buffer.h (set_buffer_internal): Make it BUFFER_INLINE. * buffer.c (set_buffer_if_live): Use set_buffer_internal. * coding.c (decode_coding): Omit redundant test. * fileio.c (decide_coding_unwind): Likewise. * fns.c (secure_hash): Likewise. * insdel.c (modify_region): Likewise. * keyboard.c (command_loop_1): Likewise. * print.c (PRINTFINISH): Likewise. * xdisp.c (run_window_scroll_functions): Use set_buffer_internal.
* | * dispnew.c: Use bool for boolean.Paul Eggert2012-08-277-166/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (frame_garbaged, display_completed, delayed_size_change) (fonts_changed_p, add_window_display_history) (add_frame_display_history, verify_row_hash) (adjust_glyph_matrix, clear_window_matrices, glyph_row_slice_p) (row_equal_p, realloc_glyph_pool) (allocate_matrices_for_frame_redisplay) (showing_window_margins_p) (adjust_frame_glyphs_for_frame_redisplay) (build_frame_matrix_from_leaf_window, make_current) (mirrored_line_dance, mirror_line_dance, update_frame) (update_window_tree, update_single_window) (check_current_matrix_flags, update_window, update_text_area) (update_window_line, set_window_update_flags, scrolling_window) (update_frame_1, scrolling, buffer_posn_from_coords) (do_pending_window_change, change_frame_size) (change_frame_size_1, sit_for): Use bool for boolean. (clear_glyph_matrix_rows): Rename from enable_glyph_matrix_rows, and remove last int (actually boolean) argument, which was always 0. All callers changed. * dispextern.h, frame.h, lisp.h: Reflect above API changes. * dispextern.h (struct composition_it): Use bool for boolean. (struct glyph_matrix): Don't assume buffer sizes can fit in 'int'. (struct bidi_it): Use unsigned:1, not int, for boolean prev_was_pdf. * dired.c (file_name_completion): Use bool for boolean. (This was missed in an earlier change.)
* | In Fset_window_configuration revert first part of last change.Martin Rudalics2012-08-272-18/+5
| | | | | | | | | | * window.c (Fset_window_configuration): Revert first part of last change.
* | * nsmenu.m (initWithContentRect:styleMask:backing:defer:): InitializeJan Djärv2012-08-273-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog_return. (windowShouldClose:): Use stop instead of stopModalWithCode. (clicked:): Ditto, and also set dialog_return. (timeout_handler:): Use stop instead of abortModal. Send a dummy event. (runDialogAt:): Make ret Lisp_Object. Set it from dialog_return when modal loop returns. * nsterm.h (NSPanel): New class variable dialog_return. Fixes: debbugs:12258
* | * composite.c, data.c, dbusbind.c, dired.c: Use bool for booleans.Paul Eggert2012-08-2710-73/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * composite.c (find_composition, composition_gstring_p) (composition_reseat_it, find_automatic_composition): * data.c (let_shadows_buffer_binding_p) (let_shadows_global_binding_p, set_internal, make_blv) (Fmake_variable_buffer_local, Fmake_local_variable) (Fmake_variable_frame_local, arithcompare, cons_to_unsigned) (cons_to_signed, arith_driver): * dbusbind.c (xd_in_read_queued_messages): * dired.c (directory_files_internal, file_name_completion): Use bool for booleans. * dired.c (file_name_completion): * process.h (fd_callback): Omit int (actually boolean) argument. It wasn't being used. All uses changed. * composite.h, lisp.h: Reflect above API changes.
* | * cmds.c, coding.c: Use bool for booleans.Paul Eggert2012-08-277-266/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cmds.c (move_point, Fself_insert_command): * coding.h (struct composition status, struct coding_system): * coding.c (detect_coding_utf_8, encode_coding_utf_8) (detect_coding_utf_16, encode_coding_utf_16, detect_coding_emacs_mule) (emacs_mule_char, decode_coding_emacs_mule) (encode_coding_emacs_mule, detect_coding_iso_2022) (decode_coding_iso_2022, encode_invocation_designation) (encode_designation_at_bol, encode_coding_iso_2022) (detect_coding_sjis, detect_coding_big5, decode_coding_sjis) (decode_coding_big5, encode_coding_sjis, encode_coding_big5) (detect_coding_ccl, encode_coding_ccl, decode_coding_raw_text) (encode_coding_raw_text, detect_coding_charset) (decode_coding_charset, encode_coding_charset, detect_eol) (detect_coding, get_translation_table, produce_chars) (consume_chars, reused_workbuf_in_use) (make_conversion_work_buffer, code_conversion_save) (decode_coding_object, encode_coding_object) (detect_coding_system, char_encodable_p) (Funencodable_char_position, code_convert_region) (code_convert_string, code_convert_string_norecord) (Fset_coding_system_priority): * fileio.c (Finsert_file_contents): Use bool for booleans. * coding.h, lisp.h: Reflect above API changes. * coding.c: Remove unnecessary static function decls. (detect_coding): Use unsigned, not signed, to copy an unsigned field. (decode_coding, encode_coding, decode_coding_gap): Return 'void', not a boolean 'int', since callers never look at the return value. (ALLOC_CONVERSION_WORK_AREA): Assume caller returns 'void', not 'int'. * coding.h (decoding_buffer_size, encoding_buffer_size) (emacs_mule_string_char): Remove unused extern decls. (struct iso_2022_spec, struct coding_system): Use 'unsigned int : 1' for boolean fields, since there's more than one. (struct emacs_mule_spec): Remove unused field 'full_support'. All initializations removed. * cmds.c (internal_self_insert): Don't assume EMACS_INT fits in 'int'.
* | Fix spare memory change.Dmitry Antipov2012-08-272-0/+8
| | | | | | | | | | * alloc.c (mark_maybe_pointer): Handle MEM_TYPE_SPARE. (valid_lisp_object_p): Likewise.
* | In dired-pop-to-buffer make window start at beginning of buffer (Bug#12281).Martin Rudalics2012-08-272-0/+7
| | | | | | | | | | * dired.el (dired-pop-to-buffer): Make window start at beginning of buffer (Bug#12281).
* | Address two problems in Fset_window_configuration (Bug#8789) and (Bug#12208).Martin Rudalics2012-08-272-2/+36
| | | | | | | | | | | | | | * window.c (Fset_window_configuration): Record any window's old buffer if it's replaced (see Bug#8789). If the new current buffer doesn't appear in the selected window, go to its old point (Bug#12208).
* | Special MEM_TYPE_SPARE to denote reserved memory.Dmitry Antipov2012-08-272-7/+17
| | | | | | | | | | | | | | * alloc.c (enum mem_type): New memory type. (refill_memory_reserve): Use new type for spare memory. This prevents live_cons_p and live_string_p from incorrect detection of uninitialized objects from spare memory as live.
* | Make special-display-* and display-buffer-reuse-frames obsolete.Chong Yidong2012-08-265-10/+28
| | | | | | | | | | | | | | | | | | | | | | * lisp/window.el (special-display-regexps, special-display-frame-alist) (special-display-buffer-names, special-display-function) (display-buffer-reuse-frames): Mark as obsolete. * lisp/progmodes/compile.el: Don't use display-buffer-reuse-frames. * help.el (help-print-return-message): Don't treat display-buffer-reuse-frames specially.
* | Spelling fixes.Paul Eggert2012-08-267-7/+10
| | | | | | | | * Makefile.in (.PHONY): versioclean -> versionclean.
* | Auto-commit of generated files.Glenn Morris2012-08-261-0/+49
| |