diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/cedet/srecode/cpp.el | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/cedet/srecode/cpp.el')
| -rw-r--r-- | lisp/cedet/srecode/cpp.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el index 94b394a1631..fd500b6d9a3 100644 --- a/lisp/cedet/srecode/cpp.el +++ b/lisp/cedet/srecode/cpp.el | |||
| @@ -70,8 +70,7 @@ HEADER - Shown section if in a header file." | |||
| 70 | (srecode-dictionary-show-section dict "NOTHEADER")) | 70 | (srecode-dictionary-show-section dict "NOTHEADER")) |
| 71 | 71 | ||
| 72 | ;; Strip out bad characters | 72 | ;; Strip out bad characters |
| 73 | (while (string-match "\\.\\| " fsym) | 73 | (setq fsym (replace-regexp-in-string "[^a-zA-Z0-9_]" "_" fsym)) |
| 74 | (setq fsym (replace-match "_" t t fsym))) | ||
| 75 | (srecode-dictionary-set-value dict "FILENAME_SYMBOL" fsym) | 74 | (srecode-dictionary-set-value dict "FILENAME_SYMBOL" fsym) |
| 76 | ) | 75 | ) |
| 77 | ) | 76 | ) |