mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

Fix merge errors (duplicates).

Browse source
This commit is contained in:
Glenn Morris 2008-01-23 05:47:31 +00:00
parent f2c8de7493
commit a025cb2f91
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2008-01-23 Glenn Morris <rgm@gnu.org>
* textmodes/org.el (org-export-latex-cleaned-string): Fix declaration.
2008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/sh-script.el (sh-basic-offset):
@ -9,20 +13,6 @@
* icomplete.el (icomplete-get-keys):
Look up KEYS using all maps in proper buffer.
2008-01-23 Vinicius Jose Latorre <viniciusjl@ig.com.br>
Miles Bader <miles@gnu.org>
* blank-mode.el: New file. Minor mode to visualise TAB,
(HARD) SPACE, NEWLINE. Miles Bader <miles@gnu.org> wrote the original
code for handling display table (via visws.el package), his code was
modified, but the main idea was kept.
2008-01-23 Alan Mackenzie <acm@muc.de>
* progmodes/cc-vars.el (c-constant-symbol): Put this defun inside
an eval-and-compile, so as to permit byte-compiling (e.g. in
bootstrap).
2008-01-23 Juanma Barranquero <lekktu@gmail.com>
* frame.el (display-mm-height, display-mm-width):