aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-26 06:30:56 +0800
committerXue Fuqiao2013-08-26 06:30:56 +0800
commiteed991017a9d80651febdb5549bc75853945dfbc (patch)
tree06d924163a6a1d13f75dfb87b0f4599d2b90caac
parent8a51e842321a59943df63faa97d98a390e22211a (diff)
downloademacs-eed991017a9d80651febdb5549bc75853945dfbc.tar.gz
emacs-eed991017a9d80651febdb5549bc75853945dfbc.zip
Fix broken customization in Flymake.
* lisp/progmodes/flymake.el (flymake-get-real-file-name-function): Fix broken customization. (Bug#15184)
-rw-r--r--doc/lispref/nonascii.texi3
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/flymake.el2
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 090310c5545..f351829e4cf 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -248,6 +248,7 @@ unibyte string, it is returned unchanged. Use this function for
248characters. 248characters.
249@end defun 249@end defun
250 250
251@c FIXME: Should `@var{character}' be `@var{byte}'?
251@defun byte-to-string byte 252@defun byte-to-string byte
252@cindex byte to string 253@cindex byte to string
253This function returns a unibyte string containing a single byte of 254This function returns a unibyte string containing a single byte of
@@ -401,6 +402,8 @@ specifies how the character behaves and how it should be handled
401during text processing and display. Thus, character properties are an 402during text processing and display. Thus, character properties are an
402important part of specifying the character's semantics. 403important part of specifying the character's semantics.
403 404
405@c FIXME: Use the latest URI of this chapter?
406@c http://www.unicode.org/versions/latest/ch04.pdf
404 On the whole, Emacs follows the Unicode Standard in its implementation 407 On the whole, Emacs follows the Unicode Standard in its implementation
405of character properties. In particular, Emacs supports the 408of character properties. In particular, Emacs supports the
406@uref{http://www.unicode.org/reports/tr23/, Unicode Character Property 409@uref{http://www.unicode.org/reports/tr23/, Unicode Character Property
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf0864561aa..09bd7d19c2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-08-25 Xue Fuqiao <xfq.free@gmail.com>
2
3 * progmodes/flymake.el (flymake-get-real-file-name-function):
4 Fix broken customization. (Bug#15184)
5
12013-08-25 Alan Mackenzie <acm@muc.de> 62013-08-25 Alan Mackenzie <acm@muc.de>
2 7
3 Improve indentation of bracelists defined by macros (without "="). 8 Improve indentation of bracelists defined by macros (without "=").
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 2ead734d163..ab86b83f7bf 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -353,7 +353,7 @@ Return nil if we cannot, non-nil if we can."
353 'flymake-simple-cleanup)) 353 'flymake-simple-cleanup))
354 354
355(defun flymake-get-real-file-name-function (file-name) 355(defun flymake-get-real-file-name-function (file-name)
356 (or (nth 4 (flymake-get-file-name-mode-and-masks file-name)) 356 (or (nth 2 (flymake-get-file-name-mode-and-masks file-name))
357 'flymake-get-real-file-name)) 357 'flymake-get-real-file-name))
358 358
359(defvar flymake-find-buildfile-cache (flymake-makehash 'equal)) 359(defvar flymake-find-buildfile-cache (flymake-makehash 'equal))