← Back to branch summary

~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to emacs/commit.h

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
https://launchpad.net/bugs/818199
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
emacs/commit.h
1
1
/*
2
 
  Copyright (c) 2005-2009 uim Project http://code.google.com/p/uim/
 
2
  Copyright (c) 2005-2011 uim Project http://code.google.com/p/uim/
3
3
 
4
4
  All rights reserved.
5
5
 
34
34
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35
35
*/
36
36
 
37
 
#ifndef UIM_AGENT_COMMIT_H
38
 
#define UIM_AGENT_COMMIT_H
 
37
#ifndef UIM_EMACS_COMMIT_H
 
38
#define UIM_EMACS_COMMIT_H
 
39
 
 
40
#include <config.h>
39
41
 
40
42
#include <stdlib.h>
41
43
 
 
44
#include <uim/uim.h>
 
45
 
42
46
#include "output.h"
43
47
 
44
48
char *add_commit_string(char *comstr, const char *str);