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/table.el | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/cedet/srecode/table.el')
| -rw-r--r-- | lisp/cedet/srecode/table.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el index 802740ba063..26163bd1e51 100644 --- a/lisp/cedet/srecode/table.el +++ b/lisp/cedet/srecode/table.el | |||
| @@ -251,7 +251,7 @@ Use PREDICATE is the same as for the `sort' function." | |||
| 251 | (defmethod srecode-dump ((tab srecode-template-table)) | 251 | (defmethod srecode-dump ((tab srecode-template-table)) |
| 252 | "Dump the contents of the SRecode template table TAB." | 252 | "Dump the contents of the SRecode template table TAB." |
| 253 | (princ "Template Table for ") | 253 | (princ "Template Table for ") |
| 254 | (princ (object-name-string tab)) | 254 | (princ (eieio-object-name-string tab)) |
| 255 | (princ "\nPriority: ") | 255 | (princ "\nPriority: ") |
| 256 | (prin1 (oref tab :priority)) | 256 | (prin1 (oref tab :priority)) |
| 257 | (when (oref tab :application) | 257 | (when (oref tab :application) |