summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes to compile cairo branch without cairo.old-branches/cairocairoJan D2015-05-232-2/+3
* Merge branch 'master' into cairoJan D2015-05-17375-3644/+88949
|\
| * Add comment that x_shift_glyphs_for_insert is never called.Jan D2015-05-171-1/+4
| * * src/lisp.mk: Remove from repository and generate at build-time.Glenn Morris2015-05-166-192/+55
| * Display shorter dates in Git annotate outputDmitry Gutov2015-05-171-3/+5
| * ASCIIfy curved quotes on displays lacking themPaul Eggert2015-05-161-0/+8
| * Small src/Makefile simplification.Glenn Morris2015-05-163-132/+127
| * * lisp/help-mode.el (help-go-forward): Doc fix.Eli Zaretskii2015-05-161-1/+1
| * * doc/lispref/debugging.texi (Profiling): Improve indexing.Eli Zaretskii2015-05-161-0/+1
| * Use `unless' to have one fewer `not'Dmitry Gutov2015-05-161-8/+6
| * Remove redundant :group declarations from vc-git.elDmitry Gutov2015-05-161-9/+4
| * Removes the predicate from lisp-complete-symbol (Bug#20456)Nicolas Petton2015-05-161-9/+6
| * Add new option vc-git-resolve-conflictsDmitry Gutov2015-05-161-7/+25
| * ; * lisp/textmodes/ispell.el (ispell-aspell-find-dictionary): Add a comment.Eli Zaretskii2015-05-161-1/+2
| * Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacsEli Zaretskii2015-05-1629-135/+193
| |\
| | * * lisp/emacs-lisp/tabulated-list.el: Don't error on nil header-stringArtur Malabarba2015-05-163-13/+21
| | * Revert "Fix cps--gensym"Leo Liu2015-05-161-1/+1
| | * ; * lib-src/etags.c: Comment.Glenn Morris2015-05-151-2/+2
| | * Replace AC_SUBST_FILE in configure with include in Makefiles.Glenn Morris2015-05-1510-59/+49
| | * Tweak japanese.el's loading of dependencies.Glenn Morris2015-05-157-7/+13
| | * Fix NS warnings.Jan D2015-05-154-30/+9
| | * Fix a enum conversion warning in macfont.mJan Djärv2015-05-151-3/+3
| | * cus-start.el: Add ns-confirm-quit.Jan Djärv2015-05-151-0/+1
| | * Fix warnings on OSX 10.10.Jan Djärv2015-05-155-21/+95
| * | Support de-alt dictionary with Aspell.Eli Zaretskii2015-05-151-1/+2
| |/
| * * lisp/emacs-lisp/package.el: Don't ensure-init during startupArtur Malabarba2015-05-151-2/+11
| * Honor :fore/background for XBM on NS (Bug#14969).Jan Djärv2015-05-154-56/+53
| * * lisp/emacs-lisp/package.el: Be more careful with the init fileArtur Malabarba2015-05-151-2/+7
| * Sync with upstream verilog-mode revision 6232468Wilson Snyder2015-05-141-74/+208
| * Check for invalid GTK+ monitor scalesPaul Eggert2015-05-141-37/+26
| * Fix daemon crashes when linum-mode is turned on early onEli Zaretskii2015-05-141-1/+5
| * ; Remove etags test files whose copyright is incompatibleEli Zaretskii2015-05-1419-23264/+192
| * Fix selective diff browsing in EdiffEli Zaretskii2015-05-141-0/+2
| * Fixes Bug#20142.Jan D2015-05-141-12/+0
| * Don't access display after i/o error (Bug#19147).Jan D2015-05-141-4/+5
| * Handle GTK_SCALE, fixes Bug#20432.Jan D2015-05-141-20/+65
| * Fix cps--gensymLeo Liu2015-05-141-1/+1
| * Fix bootstrap (void function cl-member).Glenn Morris2015-05-132-3/+6
| * * lisp/loadup.el ("emacs-lisp/cl-generic"): PreloadStefan Monnier2015-05-135-15/+43
| * Improve tagging of C bindings in DEFVAR_*Eli Zaretskii2015-05-131-0/+2
| * ; * etc/NEWS: Small edit.Glenn Morris2015-05-131-1/+2
| * * src/editfns.c (Fformat): Fix use-after-free bug (Bug#20548).Paul Eggert2015-05-121-3/+3
| * * lisp/progmodes/tcl.el (tcl-filter):Glenn Morris2015-05-121-1/+2
| * Add basic VC push support.Glenn Morris2015-05-129-71/+155
| * Improve the seq pcase pattern and the `seq-let' macroNicolas Petton2015-05-121-32/+23
| * Fix tags created from DEFVAR_* declarations in CEli Zaretskii2015-05-121-2/+2
| * Add a test suite for etagsEli Zaretskii2015-05-1296-1/+105938
| * Fix tagging of symbols in C enumerationsEli Zaretskii2015-05-121-2/+20
| * * lisp/url/url-handlers.el (url-file-name-completion)Glenn Morris2015-05-111-2/+2
| * * lisp/emacs-lisp/chart.el (chart-axis-draw): Replace obsolete alias.Glenn Morris2015-05-111-2/+2